rev 2992 - trunk/packages/kdelibs/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Jan 27 19:07:16 UTC 2006
Author: chrsmrtn
Date: 2006-01-27 19:06:31 +0000 (Fri, 27 Jan 2006)
New Revision: 2992
Modified:
trunk/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Updated buildprep.
Modified: trunk/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-01-27 19:06:01 UTC (rev 2991)
+++ trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-01-27 19:06:31 UTC (rev 2992)
@@ -1,284 +1,5 @@
#DPATCHLEVEL=0
# vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -93,12 +93,6 @@
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive nmcheck-recursive bcheck-recursive
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(potdir)"
- potDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pot_DATA)
-@@ -130,6 +124,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -171,8 +167,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -249,7 +243,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -286,6 +279,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -341,6 +337,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,8 +347,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -369,6 +364,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -544,7 +540,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -586,12 +582,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
-@@ -603,7 +599,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 $@
-@@ -625,7 +621,7 @@
- test -z "$(potdir)" || $(mkdir_p) "$(DESTDIR)$(potdir)"
- @list='$(pot_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(potDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(potdir)/$$f'"; \
- $(potDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(potdir)/$$f"; \
- done
-@@ -633,7 +629,7 @@
- uninstall-potDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pot_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(potdir)/$$f'"; \
- rm -f "$(DESTDIR)$(potdir)/$$f"; \
- done
-@@ -645,13 +641,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -663,7 +653,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -671,13 +661,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -698,7 +682,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -800,17 +784,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -824,15 +806,15 @@
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
-- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- dist-bzip2: distdir
-- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
- dist-tarZ: distdir
-- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
- dist-shar: distdir
-@@ -845,7 +827,7 @@
- $(am__remove_distdir)
-
- dist dist-all: distdir
-- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- # This target untars the dist file and tries a VPATH configuration. Then
-@@ -854,11 +836,11 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
- *.tar.Z*) \
-- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
-@@ -942,7 +924,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1007,7 +989,7 @@
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-+ dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
-@@ -1215,7 +1197,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Mainpage.dox configure.files Makefile.am.in.wo aclocal.m4 Makefile.am.in subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs acinclude.m4 Makefile.am
-+KDE_DIST=Mainpage.dox configure.files Makefile.am.in.wo aclocal.m4 Makefile.am.in stamp-h.in subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs Makefile.am configure acinclude.m4
-
- #>+ 2
- docs-am:
--- acinclude.m4
+++ acinclude.m4
@@ -1689,15 +1689,6 @@
@@ -3150,301 +2871,211 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- arts/Makefile.in
-+++ arts/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+--- aclocal.m4
++++ aclocal.m4
+@@ -11,6 +11,163 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,6 +85,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -126,8 +128,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -204,7 +204,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -241,6 +240,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -296,6 +298,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,8 +308,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -324,6 +325,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -487,7 +489,7 @@
- all: docs-am all-recursive
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [$4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
++
+ # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+@@ -501,6 +658,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
- .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*) \
-@@ -525,9 +527,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -547,13 +549,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -565,7 +561,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -573,13 +569,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -600,7 +590,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -700,17 +690,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -739,7 +727,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- arts/kde/Makefile.in
+++ arts/kde/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) $(kiotest_SOURCES) $(kiotestslow_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,14 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(artskdeincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(artskdeincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -102,24 +97,73 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/artskde.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kartsdispatcher.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kartsfloatwatch.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kartsserver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudioconverter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudiomanagerplay.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplaystream.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudiorecordstream.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconverttest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatarequest_impl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kioinputstream_impl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiotest.Po ./$(DEPDIR)/kiotestslow.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplayobject.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectcreator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kvideowidget.Plo
-+#>+ 32
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libartskde_la.all_cc.P $(DEPDIR)/libartskde_la.all_cpp.P ./$(DEPDIR)/artskde.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsdispatcher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsfloatwatch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioconverter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiomanagerplay.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplaystream.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiorecordstream.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconverttest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatarequest_impl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioinputstream_impl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiotest.Po ./$(DEPDIR)/kiotestslow.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobject.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectcreator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kvideowidget.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/artskde.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsdispatcher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsfloatwatch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioconverter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiomanagerplay.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplaystream.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiorecordstream.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconverttest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatarequest_impl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioinputstream_impl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiotest.Po ./$(DEPDIR)/kiotestslow.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobject.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectcreator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kvideowidget.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
- $(kiotest_SOURCES) $(kiotestslow_SOURCES)
- DIST_SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
-@@ -143,6 +187,8 @@
+@@ -143,6 +143,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -3453,7 +3084,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -184,8 +230,6 @@
+@@ -184,8 +186,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -3462,7 +3093,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -262,7 +306,6 @@
+@@ -262,7 +262,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -3470,7 +3101,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -299,6 +342,9 @@
+@@ -299,6 +298,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -3480,7 +3111,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -354,6 +400,7 @@
+@@ -354,6 +356,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -3488,16 +3119,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,8 +410,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -382,6 +427,7 @@
+@@ -382,6 +385,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -3505,7 +3127,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -576,7 +622,7 @@
+@@ -576,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -3514,7 +3136,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,16 +660,16 @@
+@@ -614,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3526,108 +3148,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -631,8 +677,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -695,42 +741,48 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -747,7 +799,7 @@
- test -z "$(artskdeincludedir)" || $(mkdir_p) "$(DESTDIR)$(artskdeincludedir)"
- @list='$(artskdeinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(artskdeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(artskdeincludedir)/$$f'"; \
- $(artskdeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(artskdeincludedir)/$$f"; \
- done
-@@ -755,7 +807,7 @@
- uninstall-artskdeincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(artskdeinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(artskdeincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(artskdeincludedir)/$$f"; \
- done
-@@ -862,7 +914,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
- maintainer-clean-generic:
-@@ -995,18 +1047,18 @@
+@@ -995,18 +999,18 @@
mocs: kconverttest.moc
#>+ 3
@@ -3652,7 +3173,7 @@
#>+ 3
kplayobjectcreator.moc: $(srcdir)/kplayobjectcreator.h
-@@ -1030,13 +1082,6 @@
+@@ -1030,13 +1034,6 @@
mocs: kdatarequest_impl.moc
#>+ 3
@@ -3666,7 +3187,7 @@
kplayobject.moc: $(srcdir)/kplayobject.h
$(MOC) $(srcdir)/kplayobject.h -o kplayobject.moc
-@@ -1051,11 +1096,11 @@
+@@ -1051,11 +1048,11 @@
mocs: kplayobjectfactory_p.moc
#>+ 3
@@ -3681,7 +3202,7 @@
#>+ 3
kaudiorecordstream_p.moc: $(srcdir)/kaudiorecordstream_p.h
-@@ -1065,11 +1110,18 @@
+@@ -1065,11 +1062,18 @@
mocs: kaudiorecordstream_p.moc
#>+ 3
@@ -3702,7 +3223,7 @@
#>+ 3
clean-closures:
-@@ -1117,7 +1169,7 @@
+@@ -1117,7 +1121,7 @@
#>+ 11
@@ -3711,7 +3232,7 @@
@echo 'creating libartskde_la.all_cc.cc ...'; \
rm -f libartskde_la.all_cc.files libartskde_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cc.final; \
-@@ -1129,7 +1181,7 @@
+@@ -1129,7 +1133,7 @@
rm -f libartskde_la.all_cc.final libartskde_la.all_cc.files
#>+ 11
@@ -3722,88 +3243,7 @@
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
--- arts/kde/mcop-dcop/Makefile.in
+++ arts/kde/mcop-dcop/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,10 @@
-
-
-
-+#>- SOURCES = $(kmcop_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +61,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -85,27 +82,32 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmcop.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/mcopdcopobject.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kmcop.la.Po $(DEPDIR)/kmcop_dummy.Plo $(DEPDIR)/kmcop_skel.P $(DEPDIR)/libkdeinit_kmcop_la.all_cpp.P ./$(DEPDIR)/kmcop.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mcopdcopobject.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kmcop.la.Po $(DEPDIR)/kmcop_dummy.Plo $(DEPDIR)/kmcop_skel.P ./$(DEPDIR)/kmcop.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mcopdcopobject.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kmcop_la_SOURCES)
--#>+ 1
--SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES)
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kmcop_la_SOURCES)
- #>- DIST_SOURCES = $(kmcop_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES)
-@@ -129,6 +131,8 @@
+@@ -129,6 +129,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -3812,7 +3252,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -170,8 +174,6 @@
+@@ -170,8 +172,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -3821,7 +3261,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -248,7 +250,6 @@
+@@ -248,7 +248,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -3829,7 +3269,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -285,6 +286,9 @@
+@@ -285,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -3839,7 +3279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,6 +344,7 @@
+@@ -340,6 +342,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -3847,15 +3287,6 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -349,8 +354,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
@@ -368,6 +371,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
@@ -3873,7 +3304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,16 +591,16 @@
+@@ -587,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3885,178 +3316,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -604,8 +608,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -623,7 +627,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -631,8 +635,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -689,21 +693,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -720,7 +727,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -728,7 +735,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -836,7 +843,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- arts/knotify/Makefile.in
+++ arts/knotify/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,14 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdelnkdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -84,24 +79,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/knotify.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify_la.all_cpp.P ./$(DEPDIR)/knotify.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/knotify_skel.P ./$(DEPDIR)/knotify.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
- DIST_SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
- kdelnkDATA_INSTALL = $(INSTALL_DATA)
-@@ -124,6 +126,8 @@
+@@ -124,6 +124,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4065,7 +3327,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -165,8 +169,6 @@
+@@ -165,8 +167,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4074,7 +3336,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -243,7 +245,6 @@
+@@ -243,7 +243,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4082,7 +3344,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -280,6 +281,9 @@
+@@ -280,6 +279,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4092,7 +3354,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,6 +339,7 @@
+@@ -335,6 +337,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -4100,15 +3362,6 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,8 +349,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
@@ -363,6 +366,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
@@ -4126,7 +3379,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,16 +583,16 @@
+@@ -579,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4138,138 +3391,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -596,8 +600,8 @@
+--- arts/Makefile.in
++++ arts/Makefile.in
+@@ -85,6 +85,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +128,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +204,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +240,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -296,6 +298,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -324,6 +327,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -487,7 +491,7 @@
+ all: docs-am all-recursive
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -636,21 +640,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ .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*) \
+@@ -525,9 +529,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -667,7 +674,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -675,7 +682,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -782,7 +789,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- arts/message/Makefile.in
+++ arts/message/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(artsmessage_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -64,24 +66,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/artsmessage.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/artsmessage.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(artsmessage_SOURCES)
- DIST_SOURCES = $(artsmessage_SOURCES)
- ETAGS = etags
-@@ -101,6 +106,8 @@
+@@ -101,6 +101,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4278,7 +3477,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -142,8 +149,6 @@
+@@ -142,8 +144,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4287,7 +3486,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -220,7 +225,6 @@
+@@ -220,7 +220,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4295,7 +3494,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -257,6 +261,9 @@
+@@ -257,6 +256,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4305,7 +3504,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -312,6 +319,7 @@
+@@ -312,6 +314,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -4313,16 +3512,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -321,8 +329,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -340,6 +346,7 @@
+@@ -340,6 +343,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -4330,7 +3520,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -506,7 +513,7 @@
+@@ -506,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -4339,7 +3529,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +551,9 @@
+@@ -544,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4351,43 +3541,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -592,21 +599,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -720,7 +730,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- config.h.in
+++ config.h.in
@@ -1,5 +1,8 @@
@@ -4409,27 +3562,7 @@
/* Define if you have OpenEXR */
#undef HAVE_EXR
-@@ -217,6 +217,9 @@
- /* Define if you have the initgroups prototype */
- #undef HAVE_INITGROUPS_PROTO
-
-+/* Define if your system has Linux Inode Notification */
-+#undef HAVE_INOTIFY
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-@@ -283,6 +286,9 @@
- /* Define to 1 if you have the <machine/soundcard.h> header file. */
- #undef HAVE_MACHINE_SOUNDCARD_H
-
-+/* Define to 1 if you have the `madvise' function. */
-+#undef HAVE_MADVISE
-+
- /* Define to 1 if you have the <malloc.h> header file. */
- #undef HAVE_MALLOC_H
-
-@@ -552,6 +558,9 @@
+@@ -558,6 +558,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
@@ -4439,7 +3572,7 @@
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
-@@ -579,6 +588,12 @@
+@@ -585,6 +588,12 @@
/* Define if sys/stat.h declares S_ISSOCK. */
#undef HAVE_S_ISSOCK
@@ -4478,7 +3611,7 @@
#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 kde_libs_prefix kde_libs_htmldir CONF_FILES 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 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 INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS 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 QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER PKG_CONFIG LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES 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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS 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 QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM have_pkg_config PKG_CONFIG ac_pt_PKG_CONFIG AVAHI_CFLAGS AVAHI_LIBS LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES 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 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 INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS 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 QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM have_pkg_config PKG_CONFIG ac_pt_PKG_CONFIG AVAHI_CFLAGS AVAHI_LIBS LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -4502,7 +3635,7 @@
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
--enable-strict compiles with strict compiler options (may not
-@@ -1062,12 +1068,12 @@
+@@ -1062,7 +1068,6 @@
toolchain hidden visibility default=no
--enable-sendfile enable the use of sendfile() (Linux only)
--enable-mitshm use MIT-SHM for pixmap loading/saving
@@ -4510,13 +3643,7 @@
--disable-openpty disable openpty (UNIX98 terminals) support default=enabled
--enable-fast-malloc Use own malloc implementation : yes,no,full,debug
--disable-cups disable CUPS support default=auto
- --disable-libfam don't search for libfam and do not use it
- --enable-dnotify enable use of Linux directory notifications
-+ --enable-inotify enable use of Linux inode notifications
- --disable-pcre don't require libpcre (poor RegExp support in
- Javascript)
-
-@@ -1121,6 +1127,7 @@
+@@ -1122,6 +1127,7 @@
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
@@ -4524,7 +3651,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -1213,7 +1220,7 @@
+@@ -1214,7 +1220,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -4533,63 +3660,10 @@
done
fi
-@@ -1723,7 +1730,7 @@
- rm conftest.sed
+@@ -2156,6 +2162,31 @@
--am__api_version="1.9"
-+am__api_version="1.8"
-
- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-@@ -1895,21 +1902,13 @@
- fi
-
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- # We used to keeping the `.' as first argument, in order to
-- # allow $(mkdir_p) to be used without argument. As in
-+ # Keeping the `.' argument allows $(mkdir_p) to be used without
-+ # argument. Indeed, we sometimes output rules like
- # $(mkdir_p) $(somedir)
-- # where $(somedir) is conditionally defined. However this is wrong
-- # for two reasons:
-- # 1. if the package is installed by a user who cannot write `.'
-- # make install will fail,
-- # 2. the above comment should most certainly read
-- # $(mkdir_p) $(DESTDIR)$(somedir)
-- # so it does not work when $(somedir) is undefined and
-- # $(DESTDIR) is not.
-- # To support the latter case, we have to write
-- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-- # so the `.' trick is pointless.
-- mkdir_p='mkdir -p --'
-+ # where $(somedir) is conditionally defined.
-+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-+ # expensive solution, as it forces Make to start a sub-shell.)
-+ mkdir_p='mkdir -p -- .'
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
-@@ -2053,6 +2052,9 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
-@@ -2145,13 +2147,31 @@
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
--# Always define AMTAR for backward compatibility.
-
--AMTAR=${AMTAR-"${am_missing_run}tar"}
-
--am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -4610,12 +3684,15 @@
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
-
++
+ MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-@@ -2947,8 +2967,7 @@
++
++
++
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -2948,8 +2979,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4625,7 +3702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3006,8 +3025,7 @@
+@@ -3007,8 +3037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4635,7 +3712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3123,8 +3141,7 @@
+@@ -3124,8 +3153,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4645,7 +3722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3178,8 +3195,7 @@
+@@ -3179,8 +3207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4655,7 +3732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3224,8 +3240,7 @@
+@@ -3225,8 +3252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4665,7 +3742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3269,8 +3284,7 @@
+@@ -3270,8 +3296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4675,7 +3752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3827,8 +3841,7 @@
+@@ -3828,8 +3853,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4685,7 +3762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3886,8 +3899,7 @@
+@@ -3887,8 +3911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4695,7 +3772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3958,8 +3970,7 @@
+@@ -3959,8 +3982,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4705,7 +3782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4003,8 +4014,7 @@
+@@ -4004,8 +4026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4715,7 +3792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4182,8 +4192,7 @@
+@@ -4183,8 +4204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4725,7 +3802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4294,8 +4303,7 @@
+@@ -4295,8 +4315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4735,7 +3812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4383,8 +4391,7 @@
+@@ -4384,8 +4403,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4745,7 +3822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4486,8 +4493,7 @@
+@@ -4487,8 +4505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4755,7 +3832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4586,8 +4592,7 @@
+@@ -4587,8 +4604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4765,7 +3842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4671,8 +4676,7 @@
+@@ -4672,8 +4688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4775,7 +3852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4761,8 +4765,7 @@
+@@ -4762,8 +4777,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4785,7 +3862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4849,8 +4852,7 @@
+@@ -4850,8 +4864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4795,7 +3872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4937,8 +4939,7 @@
+@@ -4938,8 +4951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4805,7 +3882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5044,8 +5045,7 @@
+@@ -5045,8 +5057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4815,7 +3892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5132,8 +5132,7 @@
+@@ -5133,8 +5144,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4825,7 +3902,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5220,8 +5219,7 @@
+@@ -5221,8 +5231,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4835,7 +3912,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5308,8 +5306,7 @@
+@@ -5309,8 +5318,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4845,7 +3922,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5440,8 +5437,7 @@
+@@ -5441,8 +5449,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4855,7 +3932,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5529,8 +5525,7 @@
+@@ -5530,8 +5537,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4865,7 +3942,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5617,8 +5612,7 @@
+@@ -5618,8 +5624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4875,7 +3952,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5705,8 +5699,7 @@
+@@ -5706,8 +5711,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4885,7 +3962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5793,8 +5786,7 @@
+@@ -5794,8 +5798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4895,7 +3972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5881,8 +5873,7 @@
+@@ -5882,8 +5885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4905,7 +3982,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6305,8 +6296,7 @@
+@@ -6306,8 +6308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4915,7 +3992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6432,8 +6422,7 @@
+@@ -6433,8 +6434,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4925,7 +4002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6521,8 +6510,7 @@
+@@ -6522,8 +6522,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4935,7 +4012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6605,185 +6593,6 @@
+@@ -6606,185 +6605,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -5121,7 +4198,7 @@
fi
-@@ -6960,7 +6769,7 @@
+@@ -6961,7 +6781,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
@@ -5130,7 +4207,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7065,7 +6874,7 @@
+@@ -7066,7 +6886,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,
@@ -5139,7 +4216,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'*)
-@@ -7099,7 +6908,7 @@
+@@ -7100,7 +6920,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5148,7 +4225,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7129,6 +6938,15 @@
+@@ -7130,6 +6950,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -5164,7 +4241,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7215,44 +7033,36 @@
+@@ -7216,44 +7045,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -5219,7 +4296,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7268,7 +7078,7 @@
+@@ -7269,7 +7090,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -5228,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
-@@ -7285,42 +7095,21 @@
+@@ -7286,42 +7107,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -5278,7 +4355,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
-@@ -7339,19 +7128,14 @@
+@@ -7340,19 +7140,14 @@
;;
openbsd*)
@@ -5300,7 +4377,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7361,7 +7145,6 @@
+@@ -7362,7 +7157,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -5308,16 +4385,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7438,7 +7221,7 @@
+@@ -7439,7 +7233,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7441 "configure"' > conftest.$ac_ext
-+ echo '#line 7224 "configure"' > conftest.$ac_ext
+- echo '#line 7442 "configure"' > conftest.$ac_ext
++ echo '#line 7236 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7481,14 +7264,13 @@
+@@ -7482,14 +7276,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -5334,7 +4411,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7500,7 +7282,6 @@
+@@ -7501,7 +7294,6 @@
esac
;;
*64-bit*)
@@ -5342,7 +4419,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7560,8 +7341,7 @@
+@@ -7561,8 +7353,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5352,7 +4429,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7636,8 +7416,7 @@
+@@ -7637,8 +7428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5362,7 +4439,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7807,8 +7586,7 @@
+@@ -7808,8 +7598,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5372,7 +4449,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7875,8 +7653,7 @@
+@@ -7876,8 +7665,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5382,7 +4459,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7991,6 +7768,243 @@
+@@ -7992,6 +7780,243 @@
done
@@ -5626,16 +4703,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'
-@@ -8083,7 +8097,7 @@
+@@ -8084,7 +8109,7 @@
# Provide some information about the compiler.
--echo "$as_me:8086:" \
-+echo "$as_me:8100:" \
+-echo "$as_me:8087:" \
++echo "$as_me:8112:" \
"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
-@@ -8129,8 +8143,7 @@
+@@ -8130,8 +8155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5645,7 +4722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8179,8 +8192,7 @@
+@@ -8180,8 +8204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5655,7 +4732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8238,7 +8250,7 @@
+@@ -8239,7 +8262,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -5664,7 +4741,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8267,20 +8279,53 @@
+@@ -8268,20 +8291,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -5724,7 +4801,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.
-@@ -8317,9 +8362,6 @@
+@@ -8318,9 +8374,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -5734,7 +4811,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'"
-@@ -8341,6 +8383,13 @@
+@@ -8342,6 +8395,13 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -5748,7 +4825,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8348,7 +8397,7 @@
+@@ -8349,7 +8409,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -5757,7 +4834,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8366,14 +8415,17 @@
+@@ -8367,14 +8427,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -5777,7 +4854,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8535,7 +8587,7 @@
+@@ -8536,7 +8599,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -5786,7 +4863,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8555,7 +8607,7 @@
+@@ -8556,7 +8619,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -5795,7 +4872,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8840,6 +8892,17 @@
+@@ -8841,6 +8904,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -5813,7 +4890,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8865,7 +8928,7 @@
+@@ -8866,7 +8940,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5822,7 +4899,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
-@@ -8927,7 +8990,7 @@
+@@ -8928,7 +9002,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5831,7 +4908,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
-@@ -9026,6 +9089,20 @@
+@@ -9027,6 +9101,20 @@
compiler=$CC
@@ -5852,7 +4929,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9062,11 +9139,16 @@
+@@ -9063,11 +9151,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -5870,7 +4947,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9112,18 +9194,20 @@
+@@ -9113,18 +9206,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 \
@@ -5878,13 +4955,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:9118: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9200: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9119: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9212: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9122: \$? = $ac_status" >&5
-+ echo "$as_me:9204: \$? = $ac_status" >&5
+- echo "$as_me:9123: \$? = $ac_status" >&5
++ echo "$as_me:9216: \$? = $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
@@ -5896,7 +4973,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9200,7 +9284,7 @@
+@@ -9201,7 +9296,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5905,7 +4982,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9226,6 +9310,16 @@
+@@ -9227,6 +9322,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -5922,7 +4999,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9237,7 +9331,7 @@
+@@ -9238,7 +9343,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.
@@ -5931,7 +5008,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9261,12 +9355,19 @@
+@@ -9262,12 +9367,19 @@
;;
linux*)
@@ -5952,7 +5029,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9287,9 +9388,14 @@
+@@ -9288,9 +9400,14 @@
;;
solaris*)
@@ -5968,7 +5045,7 @@
;;
sunos4*)
-@@ -9311,6 +9417,11 @@
+@@ -9312,6 +9429,11 @@
fi
;;
@@ -5980,7 +5057,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9345,18 +9456,20 @@
+@@ -9346,18 +9468,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 \
@@ -5988,13 +5065,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:9351: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9462: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9352: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9474: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9355: \$? = $ac_status" >&5
-+ echo "$as_me:9466: \$? = $ac_status" >&5
+- echo "$as_me:9356: \$? = $ac_status" >&5
++ echo "$as_me:9478: \$? = $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
@@ -6006,7 +5083,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9377,7 +9490,7 @@
+@@ -9378,7 +9502,7 @@
fi
fi
@@ -6015,7 +5092,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9399,38 +9512,36 @@
+@@ -9400,38 +9524,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6036,13 +5113,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:9418: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9524: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9419: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9422: \$? = $ac_status" >&5
-+ echo "$as_me:9528: \$? = $ac_status" >&5
+- echo "$as_me:9423: \$? = $ac_status" >&5
++ echo "$as_me:9540: \$? = $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
@@ -6066,7 +5143,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9501,6 +9612,16 @@
+@@ -9502,6 +9624,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -6083,7 +5160,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9521,6 +9642,27 @@
+@@ -9522,6 +9654,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -6111,7 +5188,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9558,7 +9700,7 @@
+@@ -9559,7 +9712,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6120,7 +5197,7 @@
else
ld_shlibs=no
fi
-@@ -9568,13 +9710,13 @@
+@@ -9569,13 +9722,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'
@@ -6137,17 +5214,18 @@
# 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
-@@ -9583,19 +9725,51 @@
+@@ -9584,19 +9737,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -6175,12 +5253,11 @@
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
++ else
++ ld_shlibs=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -6193,7 +5270,7 @@
fi
;;
-@@ -9613,8 +9787,8 @@
+@@ -9614,8 +9799,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6204,7 +5281,7 @@
else
ld_shlibs=no
fi
-@@ -9629,24 +9803,19 @@
+@@ -9630,24 +9815,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6236,7 +5313,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9680,9 +9849,20 @@
+@@ -9681,9 +9861,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -6259,7 +5336,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9699,7 +9879,7 @@
+@@ -9700,7 +9891,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -6268,7 +5345,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`
-@@ -9720,6 +9900,9 @@
+@@ -9721,6 +9912,9 @@
fi
esac
shared_flag='-shared'
@@ -6278,7 +5355,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9728,21 +9911,22 @@
+@@ -9729,21 +9923,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6306,7 +5383,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9766,8 +9950,7 @@
+@@ -9767,8 +9962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6316,7 +5393,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9794,14 +9977,13 @@
+@@ -9795,14 +9989,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6334,7 +5411,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9828,8 +10010,7 @@
+@@ -9829,8 +10022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6344,7 +5421,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9866,8 +10047,8 @@
+@@ -9867,8 +10059,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -6355,7 +5432,7 @@
fi
fi
;;
-@@ -9880,7 +10061,7 @@
+@@ -9881,7 +10073,7 @@
ld_shlibs=no
;;
@@ -6364,7 +5441,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9890,13 +10071,13 @@
+@@ -9891,13 +10083,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -6381,7 +5458,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.
-@@ -9906,52 +10087,52 @@
+@@ -9907,52 +10099,52 @@
;;
darwin* | rhapsody*)
@@ -6474,7 +5551,7 @@
fi
;;
-@@ -9985,8 +10166,8 @@
+@@ -9986,8 +10178,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6485,7 +5562,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9994,7 +10175,7 @@
+@@ -9995,7 +10187,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6494,7 +5571,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
-@@ -10010,16 +10191,16 @@
+@@ -10011,16 +10203,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -6515,7 +5592,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10029,7 +10210,7 @@
+@@ -10030,7 +10222,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -6524,7 +5601,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10062,7 +10243,7 @@
+@@ -10063,7 +10255,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6533,7 +5610,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'
-@@ -10072,7 +10253,7 @@
+@@ -10073,7 +10265,7 @@
link_all_deplibs=yes
;;
@@ -6542,7 +5619,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10095,7 +10276,8 @@
+@@ -10096,7 +10288,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
@@ -6552,7 +5629,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10105,7 +10287,7 @@
+@@ -10106,7 +10299,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6561,7 +5638,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10116,14 +10298,14 @@
+@@ -10117,14 +10310,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6578,7 +5655,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'
-@@ -10135,13 +10317,13 @@
+@@ -10136,13 +10329,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6594,7 +5671,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10160,10 +10342,12 @@
+@@ -10161,10 +10354,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -6609,7 +5686,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'
-@@ -10172,8 +10356,18 @@
+@@ -10173,8 +10368,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6630,7 +5707,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10182,7 +10376,7 @@
+@@ -10183,7 +10388,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.
@@ -6639,7 +5716,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10242,9 +10436,9 @@
+@@ -10243,9 +10448,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -6651,7 +5728,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10350,7 +10544,7 @@
+@@ -10351,7 +10556,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6660,7 +5737,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10360,7 +10554,20 @@
+@@ -10361,7 +10566,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6682,7 +5759,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10425,7 +10632,7 @@
+@@ -10426,7 +10644,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6691,7 +5768,7 @@
;;
beos*)
-@@ -10434,7 +10641,7 @@
+@@ -10435,7 +10653,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6700,7 +5777,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10450,7 +10657,7 @@
+@@ -10451,7 +10669,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6709,7 +5786,7 @@
need_version=no
need_lib_prefix=no
-@@ -10462,7 +10669,8 @@
+@@ -10463,7 +10681,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6719,7 +5796,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10492,7 +10700,7 @@
+@@ -10493,7 +10712,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6728,7 +5805,7 @@
;;
esac
;;
-@@ -10515,7 +10723,7 @@
+@@ -10516,7 +10735,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6737,7 +5814,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"`
-@@ -10538,7 +10746,7 @@
+@@ -10539,7 +10758,7 @@
dynamic_linker=no
;;
@@ -6746,7 +5823,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10550,8 +10758,17 @@
+@@ -10551,8 +10770,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6766,7 +5843,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10569,7 +10786,7 @@
+@@ -10570,7 +10798,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6775,7 +5852,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10596,9 +10813,9 @@
+@@ -10597,9 +10825,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6787,7 +5864,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10613,7 +10830,7 @@
+@@ -10614,7 +10842,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6796,7 +5873,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10624,7 +10841,7 @@
+@@ -10625,7 +10853,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6805,7 +5882,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10686,22 +10903,19 @@
+@@ -10687,22 +10915,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'
@@ -6834,7 +5911,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,
-@@ -10711,6 +10925,30 @@
+@@ -10712,6 +10937,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6865,7 +5942,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10720,7 +10958,7 @@
+@@ -10721,7 +10970,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6874,7 +5951,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10749,7 +10987,11 @@
+@@ -10750,7 +10999,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6887,7 +5964,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
-@@ -10769,7 +11011,7 @@
+@@ -10770,7 +11023,7 @@
os2*)
libname_spec='$name'
@@ -6896,7 +5973,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10871,8 +11113,8 @@
+@@ -10872,8 +11125,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -6907,7 +5984,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -10998,8 +11240,7 @@
+@@ -10999,8 +11252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6917,7 +5994,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11102,8 +11343,7 @@
+@@ -11103,8 +11355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6927,7 +6004,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11168,8 +11408,7 @@
+@@ -11169,8 +11420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6937,7 +6014,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11262,8 +11501,7 @@
+@@ -11263,8 +11513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6947,7 +6024,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11328,8 +11566,7 @@
+@@ -11329,8 +11578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6957,7 +6034,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11395,8 +11632,7 @@
+@@ -11396,8 +11644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6967,7 +6044,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11462,8 +11698,7 @@
+@@ -11463,8 +11710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6977,16 +6054,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11538,7 +11773,7 @@
+@@ -11539,7 +11785,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11541 "configure"
-+#line 11776 "configure"
+-#line 11542 "configure"
++#line 11788 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11604,7 +11839,7 @@
+@@ -11605,7 +11851,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6995,16 +6072,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11636,7 +11871,7 @@
+@@ -11637,7 +11883,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11639 "configure"
-+#line 11874 "configure"
+-#line 11640 "configure"
++#line 11886 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11702,7 +11937,7 @@
+@@ -11703,7 +11949,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7013,7 +6090,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11752,7 +11987,7 @@
+@@ -11753,7 +11999,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7022,7 +6099,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11761,47 +11996,10 @@
+@@ -11762,47 +12008,10 @@
fi
;;
@@ -7071,7 +6148,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11827,7 +12025,8 @@
+@@ -11828,7 +12037,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.
@@ -7081,7 +6158,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 \
-@@ -11941,11 +12140,11 @@
+@@ -11942,11 +12152,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7095,7 +6172,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11975,6 +12174,12 @@
+@@ -11976,6 +12186,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7108,7 +6185,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12005,7 +12210,7 @@
+@@ -12006,7 +12222,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7117,7 +6194,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12036,7 +12241,7 @@
+@@ -12037,7 +12253,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7126,7 +6203,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12051,7 +12256,7 @@
+@@ -12052,7 +12268,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -7135,7 +6212,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12278,7 +12483,10 @@
+@@ -12279,7 +12495,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.
@@ -7147,7 +6224,7 @@
fi
-@@ -12343,7 +12551,9 @@
+@@ -12344,7 +12563,9 @@
case $tagname in
CXX)
@@ -7158,7 +6235,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12380,7 +12590,7 @@
+@@ -12381,7 +12602,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -7167,7 +6244,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12401,6 +12611,20 @@
+@@ -12402,6 +12623,20 @@
compiler=$CC
@@ -7188,7 +6265,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12422,7 +12646,16 @@
+@@ -12423,7 +12658,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -7206,7 +6283,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12493,7 +12726,7 @@
+@@ -12494,7 +12738,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,
@@ -7215,7 +6292,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'*)
-@@ -12527,7 +12760,7 @@
+@@ -12528,7 +12772,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7224,7 +6301,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12546,8 +12779,8 @@
+@@ -12547,8 +12791,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
@@ -7235,7 +6312,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12573,7 +12806,7 @@
+@@ -12574,7 +12818,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.
@@ -7244,7 +6321,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12604,8 +12837,22 @@
+@@ -12605,8 +12849,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -7269,7 +6346,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12622,7 +12869,7 @@
+@@ -12623,7 +12881,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -7278,7 +6355,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`
-@@ -12643,6 +12890,9 @@
+@@ -12644,6 +12902,9 @@
fi
esac
shared_flag='-shared'
@@ -7288,7 +6365,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12651,15 +12901,16 @@
+@@ -12652,15 +12913,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7309,7 +6386,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.
-@@ -12689,8 +12940,7 @@
+@@ -12690,8 +12952,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7319,7 +6396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12719,13 +12969,12 @@
+@@ -12720,13 +12981,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7335,7 +6412,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12752,8 +13001,7 @@
+@@ -12753,8 +13013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7345,7 +6422,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12790,8 +13038,8 @@
+@@ -12791,8 +13050,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -7356,7 +6433,7 @@
fi
fi
;;
-@@ -12804,16 +13052,17 @@
+@@ -12805,16 +13064,17 @@
esac
;;
@@ -7376,7 +6453,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
-@@ -12822,70 +13071,81 @@
+@@ -12823,70 +13083,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7510,7 +6587,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12896,14 +13156,14 @@
+@@ -12897,14 +13168,14 @@
;;
esac
;;
@@ -7527,7 +6604,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12920,12 +13180,12 @@
+@@ -12921,12 +13192,12 @@
# location of the library.
case $cc_basename in
@@ -7543,7 +6620,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12934,11 +13194,11 @@
+@@ -12935,11 +13206,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.
@@ -7557,7 +6634,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12948,7 +13208,7 @@
+@@ -12949,7 +13220,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -7566,7 +6643,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12964,7 +13224,7 @@
+@@ -12965,7 +13236,7 @@
;;
esac
fi
@@ -7575,7 +6652,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12985,17 +13245,17 @@
+@@ -12986,17 +13257,17 @@
esac
case $cc_basename in
@@ -7597,7 +6674,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13011,12 +13271,12 @@
+@@ -13012,12 +13283,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -7612,7 +6689,7 @@
;;
esac
fi
-@@ -13029,9 +13289,9 @@
+@@ -13030,9 +13301,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -7624,7 +6701,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13042,9 +13302,9 @@
+@@ -13043,9 +13314,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -7636,7 +6713,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13055,14 +13315,14 @@
+@@ -13056,14 +13327,14 @@
;;
linux*)
case $cc_basename in
@@ -7654,7 +6731,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13080,20 +13340,44 @@
+@@ -13081,20 +13352,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7705,7 +6782,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13121,7 +13405,7 @@
+@@ -13122,7 +13417,7 @@
;;
mvs*)
case $cc_basename in
@@ -7714,7 +6791,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13131,7 +13415,7 @@
+@@ -13132,7 +13427,7 @@
;;
esac
;;
@@ -7723,7 +6800,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=
-@@ -13142,15 +13426,31 @@
+@@ -13143,15 +13438,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::"'
;;
@@ -7757,7 +6834,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13160,14 +13460,14 @@
+@@ -13161,14 +13472,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7775,7 +6852,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13185,7 +13485,7 @@
+@@ -13186,7 +13497,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7784,7 +6861,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13204,13 +13504,13 @@
+@@ -13205,13 +13516,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -7800,7 +6877,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13219,17 +13519,17 @@
+@@ -13220,17 +13531,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -7822,7 +6899,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13248,7 +13548,7 @@
+@@ -13249,7 +13560,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7831,7 +6908,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13272,7 +13572,7 @@
+@@ -13273,7 +13584,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -7840,7 +6917,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13284,12 +13584,12 @@
+@@ -13285,12 +13596,12 @@
;;
sunos4*)
case $cc_basename in
@@ -7855,7 +6932,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13302,36 +13602,33 @@
+@@ -13303,36 +13614,33 @@
;;
solaris*)
case $cc_basename in
@@ -7904,7 +6981,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13339,9 +13636,9 @@
+@@ -13340,9 +13648,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -7916,7 +6993,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13351,9 +13648,9 @@
+@@ -13352,9 +13660,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
@@ -7928,7 +7005,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13362,9 +13659,9 @@
+@@ -13363,9 +13671,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7940,7 +7017,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13382,7 +13679,7 @@
+@@ -13383,7 +13691,7 @@
;;
tandem*)
case $cc_basename in
@@ -7949,7 +7026,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13439,7 +13736,7 @@
+@@ -13440,7 +13748,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.
@@ -7958,7 +7035,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13479,7 +13776,7 @@
+@@ -13480,7 +13788,7 @@
fi
;;
@@ -7967,7 +7044,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13515,6 +13812,20 @@
+@@ -13516,6 +13824,20 @@
$rm -f confest.$objext
@@ -7988,7 +7065,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13570,7 +13881,7 @@
+@@ -13571,7 +13893,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7997,7 +7074,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13595,18 +13906,28 @@
+@@ -13596,18 +13918,28 @@
;;
chorus*)
case $cc_basename in
@@ -8029,7 +7106,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13614,22 +13935,22 @@
+@@ -13615,22 +13947,22 @@
;;
esac
;;
@@ -8056,7 +7133,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13644,7 +13965,7 @@
+@@ -13645,7 +13977,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -8065,7 +7142,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13655,18 +13976,24 @@
+@@ -13656,18 +13988,24 @@
;;
linux*)
case $cc_basename in
@@ -8093,7 +7170,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13683,25 +14010,25 @@
+@@ -13684,25 +14022,25 @@
;;
mvs*)
case $cc_basename in
@@ -8124,7 +7201,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13717,7 +14044,7 @@
+@@ -13718,7 +14056,7 @@
;;
sco*)
case $cc_basename in
@@ -8133,7 +7210,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13726,13 +14053,13 @@
+@@ -13727,13 +14065,13 @@
;;
solaris*)
case $cc_basename in
@@ -8149,7 +7226,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13742,12 +14069,12 @@
+@@ -13743,12 +14081,12 @@
;;
sunos4*)
case $cc_basename in
@@ -8164,7 +7241,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13757,7 +14084,7 @@
+@@ -13758,7 +14096,7 @@
;;
tandem*)
case $cc_basename in
@@ -8173,7 +7250,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13798,18 +14125,20 @@
+@@ -13799,18 +14137,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 \
@@ -8181,13 +7258,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:13804: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14131: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13805: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14143: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13808: \$? = $ac_status" >&5
-+ echo "$as_me:14135: \$? = $ac_status" >&5
+- echo "$as_me:13809: \$? = $ac_status" >&5
++ echo "$as_me:14147: \$? = $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
@@ -8199,7 +7276,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13830,7 +14159,7 @@
+@@ -13831,7 +14171,7 @@
fi
fi
@@ -8208,7 +7285,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13852,38 +14181,36 @@
+@@ -13853,38 +14193,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8229,13 +7306,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:13871: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14193: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13872: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13875: \$? = $ac_status" >&5
-+ echo "$as_me:14197: \$? = $ac_status" >&5
+- echo "$as_me:13876: \$? = $ac_status" >&5
++ echo "$as_me:14209: \$? = $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
@@ -8259,7 +7336,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13933,7 +14260,10 @@
+@@ -13934,7 +14272,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -8271,7 +7348,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14016,7 +14346,7 @@
+@@ -14017,7 +14358,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8280,7 +7357,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14026,7 +14356,20 @@
+@@ -14027,7 +14368,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8302,7 +7379,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14091,7 +14434,7 @@
+@@ -14092,7 +14446,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8311,7 +7388,7 @@
;;
beos*)
-@@ -14100,7 +14443,7 @@
+@@ -14101,7 +14455,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8320,7 +7397,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14116,7 +14459,7 @@
+@@ -14117,7 +14471,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8329,7 +7406,7 @@
need_version=no
need_lib_prefix=no
-@@ -14128,7 +14471,8 @@
+@@ -14129,7 +14483,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8339,7 +7416,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14158,7 +14502,7 @@
+@@ -14159,7 +14514,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8348,7 +7425,7 @@
;;
esac
;;
-@@ -14181,7 +14525,7 @@
+@@ -14182,7 +14537,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8357,7 +7434,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"`
-@@ -14204,7 +14548,7 @@
+@@ -14205,7 +14560,7 @@
dynamic_linker=no
;;
@@ -8366,7 +7443,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14216,8 +14560,17 @@
+@@ -14217,8 +14572,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8386,7 +7463,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14235,7 +14588,7 @@
+@@ -14236,7 +14600,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8395,7 +7472,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14262,9 +14615,9 @@
+@@ -14263,9 +14627,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8407,7 +7484,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14279,7 +14632,7 @@
+@@ -14280,7 +14644,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8416,7 +7493,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14290,7 +14643,7 @@
+@@ -14291,7 +14655,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8425,7 +7502,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14352,22 +14705,19 @@
+@@ -14353,22 +14717,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'
@@ -8454,7 +7531,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,
-@@ -14377,6 +14727,30 @@
+@@ -14378,6 +14739,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8485,7 +7562,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14386,7 +14760,7 @@
+@@ -14387,7 +14772,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8494,7 +7571,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14415,7 +14789,11 @@
+@@ -14416,7 +14801,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8507,7 +7584,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
-@@ -14435,7 +14813,7 @@
+@@ -14436,7 +14825,7 @@
os2*)
libname_spec='$name'
@@ -8516,7 +7593,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14537,8 +14915,8 @@
+@@ -14538,8 +14927,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -8527,7 +7604,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14664,8 +15042,7 @@
+@@ -14665,8 +15054,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8537,7 +7614,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14768,8 +15145,7 @@
+@@ -14769,8 +15157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8547,7 +7624,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14834,8 +15210,7 @@
+@@ -14835,8 +15222,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8557,7 +7634,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14928,8 +15303,7 @@
+@@ -14929,8 +15315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8567,7 +7644,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14994,8 +15368,7 @@
+@@ -14995,8 +15380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8577,7 +7654,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15061,8 +15434,7 @@
+@@ -15062,8 +15446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8587,7 +7664,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15128,8 +15500,7 @@
+@@ -15129,8 +15512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8597,16 +7674,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15204,7 +15575,7 @@
+@@ -15205,7 +15587,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15207 "configure"
-+#line 15578 "configure"
+-#line 15208 "configure"
++#line 15590 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15270,7 +15641,7 @@
+@@ -15271,7 +15653,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -8615,16 +7692,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15302,7 +15673,7 @@
+@@ -15303,7 +15685,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15305 "configure"
-+#line 15676 "configure"
+-#line 15306 "configure"
++#line 15688 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15368,7 +15739,7 @@
+@@ -15369,7 +15751,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -8633,7 +7710,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15419,7 +15790,8 @@
+@@ -15420,7 +15802,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.
@@ -8643,7 +7720,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 \
-@@ -15519,6 +15891,12 @@
+@@ -15520,6 +15903,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8656,7 +7733,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15549,7 +15927,7 @@
+@@ -15550,7 +15939,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8665,7 +7742,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15580,7 +15958,7 @@
+@@ -15581,7 +15970,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8674,7 +7751,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15595,7 +15973,7 @@
+@@ -15596,7 +15985,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -8683,7 +7760,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15797,7 +16175,10 @@
+@@ -15798,7 +16187,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.
@@ -8695,7 +7772,7 @@
fi
-@@ -15873,12 +16254,35 @@
+@@ -15874,12 +16266,35 @@
compiler=$CC
@@ -8732,7 +7809,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15891,7 +16295,7 @@
+@@ -15892,7 +16307,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -8741,7 +7818,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15899,8 +16303,10 @@
+@@ -15900,8 +16315,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -8754,7 +7831,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15977,7 +16383,7 @@
+@@ -15978,7 +16395,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8763,7 +7840,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16003,6 +16409,16 @@
+@@ -16004,6 +16421,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8780,7 +7857,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16014,7 +16430,7 @@
+@@ -16015,7 +16442,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.
@@ -8789,7 +7866,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16038,12 +16454,19 @@
+@@ -16039,12 +16466,19 @@
;;
linux*)
@@ -8810,7 +7887,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16064,9 +16487,14 @@
+@@ -16065,9 +16499,14 @@
;;
solaris*)
@@ -8826,7 +7903,7 @@
;;
sunos4*)
-@@ -16088,6 +16516,11 @@
+@@ -16089,6 +16528,11 @@
fi
;;
@@ -8838,7 +7915,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16122,18 +16555,20 @@
+@@ -16123,18 +16567,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 \
@@ -8846,13 +7923,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:16128: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16561: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16129: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16573: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16132: \$? = $ac_status" >&5
-+ echo "$as_me:16565: \$? = $ac_status" >&5
+- echo "$as_me:16133: \$? = $ac_status" >&5
++ echo "$as_me:16577: \$? = $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
@@ -8864,7 +7941,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16154,7 +16589,7 @@
+@@ -16155,7 +16601,7 @@
fi
fi
@@ -8873,7 +7950,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16176,38 +16611,36 @@
+@@ -16177,38 +16623,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8894,13 +7971,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:16195: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16623: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16196: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16199: \$? = $ac_status" >&5
-+ echo "$as_me:16627: \$? = $ac_status" >&5
+- echo "$as_me:16200: \$? = $ac_status" >&5
++ echo "$as_me:16639: \$? = $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
@@ -8924,7 +8001,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16278,6 +16711,16 @@
+@@ -16279,6 +16723,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8941,7 +8018,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16298,6 +16741,27 @@
+@@ -16299,6 +16753,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8969,7 +8046,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16335,7 +16799,7 @@
+@@ -16336,7 +16811,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8978,7 +8055,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16345,13 +16809,13 @@
+@@ -16346,13 +16821,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'
@@ -8995,7 +8072,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
-@@ -16360,19 +16824,51 @@
+@@ -16361,19 +16836,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -9004,10 +8081,9 @@
else
- ld_shlibs=no
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -9037,9 +8113,10 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -9052,7 +8129,7 @@
fi
;;
-@@ -16390,8 +16886,8 @@
+@@ -16391,8 +16898,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9063,7 +8140,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16406,24 +16902,19 @@
+@@ -16407,24 +16914,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9095,7 +8172,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16457,9 +16948,20 @@
+@@ -16458,9 +16960,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -9118,7 +8195,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16476,7 +16978,7 @@
+@@ -16477,7 +16990,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -9127,7 +8204,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`
-@@ -16497,6 +16999,9 @@
+@@ -16498,6 +17011,9 @@
fi
esac
shared_flag='-shared'
@@ -9137,7 +8214,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16505,21 +17010,22 @@
+@@ -16506,21 +17022,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -9165,7 +8242,7 @@
program main
end
-@@ -16533,8 +17039,7 @@
+@@ -16534,8 +17051,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9175,7 +8252,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16561,14 +17066,13 @@
+@@ -16562,14 +17078,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9193,7 +8270,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16585,8 +17089,7 @@
+@@ -16586,8 +17101,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9203,7 +8280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16623,8 +17126,8 @@
+@@ -16624,8 +17138,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -9214,7 +8291,7 @@
fi
fi
;;
-@@ -16637,7 +17140,7 @@
+@@ -16638,7 +17152,7 @@
ld_shlibs_F77=no
;;
@@ -9223,7 +8300,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16647,68 +17150,68 @@
+@@ -16648,68 +17162,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -9336,7 +8413,7 @@
fi
;;
-@@ -16742,8 +17245,8 @@
+@@ -16743,8 +17257,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9347,7 +8424,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16751,7 +17254,7 @@
+@@ -16752,7 +17266,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9356,7 +8433,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
-@@ -16767,16 +17270,16 @@
+@@ -16768,16 +17282,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9377,7 +8454,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16786,7 +17289,7 @@
+@@ -16787,7 +17301,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9386,7 +8463,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16819,7 +17322,7 @@
+@@ -16820,7 +17334,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9395,7 +8472,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'
-@@ -16829,7 +17332,7 @@
+@@ -16830,7 +17344,7 @@
link_all_deplibs_F77=yes
;;
@@ -9404,7 +8481,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
-@@ -16852,7 +17355,8 @@
+@@ -16853,7 +17367,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
@@ -9414,7 +8491,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16862,7 +17366,7 @@
+@@ -16863,7 +17378,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -9423,7 +8500,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16873,14 +17377,14 @@
+@@ -16874,14 +17389,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -9440,7 +8517,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'
-@@ -16892,13 +17396,13 @@
+@@ -16893,13 +17408,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -9456,7 +8533,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16917,10 +17421,12 @@
+@@ -16918,10 +17433,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -9471,7 +8548,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'
-@@ -16929,8 +17435,18 @@
+@@ -16930,8 +17447,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9492,7 +8569,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16939,7 +17455,7 @@
+@@ -16940,7 +17467,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.
@@ -9501,7 +8578,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16999,9 +17515,9 @@
+@@ -17000,9 +17527,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9513,7 +8590,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17107,7 +17623,7 @@
+@@ -17108,7 +17635,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9522,7 +8599,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17117,7 +17633,20 @@
+@@ -17118,7 +17645,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9544,7 +8621,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17182,7 +17711,7 @@
+@@ -17183,7 +17723,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9553,7 +8630,7 @@
;;
beos*)
-@@ -17191,7 +17720,7 @@
+@@ -17192,7 +17732,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9562,7 +8639,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17207,7 +17736,7 @@
+@@ -17208,7 +17748,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9571,7 +8648,7 @@
need_version=no
need_lib_prefix=no
-@@ -17219,7 +17748,8 @@
+@@ -17220,7 +17760,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9581,7 +8658,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17249,7 +17779,7 @@
+@@ -17250,7 +17791,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9590,7 +8667,7 @@
;;
esac
;;
-@@ -17272,7 +17802,7 @@
+@@ -17273,7 +17814,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9599,7 +8676,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"`
-@@ -17295,7 +17825,7 @@
+@@ -17296,7 +17837,7 @@
dynamic_linker=no
;;
@@ -9608,7 +8685,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17307,8 +17837,17 @@
+@@ -17308,8 +17849,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9628,7 +8705,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17326,7 +17865,7 @@
+@@ -17327,7 +17877,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9637,7 +8714,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17353,9 +17892,9 @@
+@@ -17354,9 +17904,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9649,7 +8726,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17370,7 +17909,7 @@
+@@ -17371,7 +17921,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9658,7 +8735,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17381,7 +17920,7 @@
+@@ -17382,7 +17932,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9667,7 +8744,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17443,22 +17982,19 @@
+@@ -17444,22 +17994,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'
@@ -9696,7 +8773,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,
-@@ -17468,6 +18004,30 @@
+@@ -17469,6 +18016,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9727,7 +8804,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17477,7 +18037,7 @@
+@@ -17478,7 +18049,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9736,7 +8813,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17506,7 +18066,11 @@
+@@ -17507,7 +18078,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9749,7 +8826,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
-@@ -17526,7 +18090,7 @@
+@@ -17527,7 +18102,7 @@
os2*)
libname_spec='$name'
@@ -9758,7 +8835,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17628,8 +18192,8 @@
+@@ -17629,8 +18204,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -9769,7 +8846,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17705,7 +18269,8 @@
+@@ -17706,7 +18281,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.
@@ -9779,7 +8856,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 \
-@@ -17805,6 +18370,12 @@
+@@ -17806,6 +18382,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9792,7 +8869,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17835,7 +18406,7 @@
+@@ -17836,7 +18418,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9801,7 +8878,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17866,7 +18437,7 @@
+@@ -17867,7 +18449,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9810,7 +8887,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17881,7 +18452,7 @@
+@@ -17882,7 +18464,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -9819,7 +8896,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18083,7 +18654,10 @@
+@@ -18084,7 +18666,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.
@@ -9831,7 +8908,7 @@
fi
-@@ -18116,7 +18690,7 @@
+@@ -18117,7 +18702,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -9840,7 +8917,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18127,15 +18701,41 @@
+@@ -18128,15 +18713,41 @@
compiler=$CC
@@ -9882,7 +8959,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
-@@ -18162,18 +18762,20 @@
+@@ -18163,18 +18774,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 \
@@ -9890,13 +8967,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:18168: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18768: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18169: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18780: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18172: \$? = $ac_status" >&5
-+ echo "$as_me:18772: \$? = $ac_status" >&5
+- echo "$as_me:18173: \$? = $ac_status" >&5
++ echo "$as_me:18784: \$? = $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
@@ -9908,7 +8985,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18250,7 +18852,7 @@
+@@ -18251,7 +18864,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -9917,7 +8994,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18276,6 +18878,16 @@
+@@ -18277,6 +18890,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -9934,7 +9011,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18287,7 +18899,7 @@
+@@ -18288,7 +18911,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.
@@ -9943,7 +9020,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18311,12 +18923,19 @@
+@@ -18312,12 +18935,19 @@
;;
linux*)
@@ -9964,7 +9041,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18337,9 +18956,14 @@
+@@ -18338,9 +18968,14 @@
;;
solaris*)
@@ -9980,7 +9057,7 @@
;;
sunos4*)
-@@ -18361,6 +18985,11 @@
+@@ -18362,6 +18997,11 @@
fi
;;
@@ -9992,7 +9069,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18395,18 +19024,20 @@
+@@ -18396,18 +19036,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 \
@@ -10000,13 +9077,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:18401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19030: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18402: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19042: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18405: \$? = $ac_status" >&5
-+ echo "$as_me:19034: \$? = $ac_status" >&5
+- echo "$as_me:18406: \$? = $ac_status" >&5
++ echo "$as_me:19046: \$? = $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
@@ -10018,7 +9095,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18427,7 +19058,7 @@
+@@ -18428,7 +19070,7 @@
fi
fi
@@ -10027,7 +9104,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18449,38 +19080,36 @@
+@@ -18450,38 +19092,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -10048,13 +9125,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:18468: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19092: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18469: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19104: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18472: \$? = $ac_status" >&5
-+ echo "$as_me:19096: \$? = $ac_status" >&5
+- echo "$as_me:18473: \$? = $ac_status" >&5
++ echo "$as_me:19108: \$? = $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
@@ -10078,7 +9155,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18551,6 +19180,16 @@
+@@ -18552,6 +19192,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -10095,7 +9172,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18571,6 +19210,27 @@
+@@ -18572,6 +19222,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -10123,7 +9200,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18608,7 +19268,7 @@
+@@ -18609,7 +19280,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -10132,7 +9209,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18618,13 +19278,13 @@
+@@ -18619,13 +19290,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'
@@ -10149,7 +9226,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
-@@ -18633,19 +19293,51 @@
+@@ -18634,19 +19305,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -10158,9 +9235,10 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -10190,10 +9268,9 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10206,7 +9283,7 @@
fi
;;
-@@ -18663,8 +19355,8 @@
+@@ -18664,8 +19367,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10217,7 +9294,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18679,24 +19371,19 @@
+@@ -18680,24 +19383,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10249,7 +9326,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18730,9 +19417,20 @@
+@@ -18731,9 +19429,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -10272,7 +9349,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18749,7 +19447,7 @@
+@@ -18750,7 +19459,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -10281,7 +9358,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`
-@@ -18770,6 +19468,9 @@
+@@ -18771,6 +19480,9 @@
fi
esac
shared_flag='-shared'
@@ -10291,7 +9368,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18778,21 +19479,22 @@
+@@ -18779,21 +19491,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -10319,7 +9396,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18816,8 +19518,7 @@
+@@ -18817,8 +19530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10329,7 +9406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18844,14 +19545,13 @@
+@@ -18845,14 +19557,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10347,7 +9424,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18878,8 +19578,7 @@
+@@ -18879,8 +19590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10357,7 +9434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18916,8 +19615,8 @@
+@@ -18917,8 +19627,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -10368,7 +9445,7 @@
fi
fi
;;
-@@ -18930,7 +19629,7 @@
+@@ -18931,7 +19641,7 @@
ld_shlibs_GCJ=no
;;
@@ -10377,7 +9454,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18940,68 +19639,68 @@
+@@ -18941,68 +19651,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -10490,7 +9567,7 @@
fi
;;
-@@ -19035,8 +19734,8 @@
+@@ -19036,8 +19746,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10501,7 +9578,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19044,7 +19743,7 @@
+@@ -19045,7 +19755,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -10510,7 +9587,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
-@@ -19060,16 +19759,16 @@
+@@ -19061,16 +19771,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -10531,7 +9608,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19079,7 +19778,7 @@
+@@ -19080,7 +19790,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -10540,7 +9617,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19112,7 +19811,7 @@
+@@ -19113,7 +19823,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10549,7 +9626,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'
-@@ -19122,7 +19821,7 @@
+@@ -19123,7 +19833,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -10558,7 +9635,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
-@@ -19145,7 +19844,8 @@
+@@ -19146,7 +19856,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
@@ -10568,7 +9645,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19155,7 +19855,7 @@
+@@ -19156,7 +19867,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -10577,7 +9654,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19166,14 +19866,14 @@
+@@ -19167,14 +19878,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -10594,7 +9671,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'
-@@ -19185,13 +19885,13 @@
+@@ -19186,13 +19897,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -10610,7 +9687,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19210,10 +19910,12 @@
+@@ -19211,10 +19922,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -10625,7 +9702,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'
-@@ -19222,8 +19924,18 @@
+@@ -19223,8 +19936,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -10646,7 +9723,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19232,7 +19944,7 @@
+@@ -19233,7 +19956,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.
@@ -10655,7 +9732,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19292,9 +20004,9 @@
+@@ -19293,9 +20016,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -10667,7 +9744,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19400,7 +20112,7 @@
+@@ -19401,7 +20124,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -10676,7 +9753,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19410,7 +20122,20 @@
+@@ -19411,7 +20134,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -10698,7 +9775,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19475,7 +20200,7 @@
+@@ -19476,7 +20212,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -10707,7 +9784,7 @@
;;
beos*)
-@@ -19484,7 +20209,7 @@
+@@ -19485,7 +20221,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -10716,7 +9793,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19500,7 +20225,7 @@
+@@ -19501,7 +20237,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -10725,7 +9802,7 @@
need_version=no
need_lib_prefix=no
-@@ -19512,7 +20237,8 @@
+@@ -19513,7 +20249,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -10735,7 +9812,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19542,7 +20268,7 @@
+@@ -19543,7 +20280,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -10744,7 +9821,7 @@
;;
esac
;;
-@@ -19565,7 +20291,7 @@
+@@ -19566,7 +20303,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -10753,7 +9830,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"`
-@@ -19588,7 +20314,7 @@
+@@ -19589,7 +20326,7 @@
dynamic_linker=no
;;
@@ -10762,7 +9839,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19600,8 +20326,17 @@
+@@ -19601,8 +20338,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -10782,7 +9859,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19619,7 +20354,7 @@
+@@ -19620,7 +20366,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -10791,7 +9868,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19646,9 +20381,9 @@
+@@ -19647,9 +20393,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -10803,7 +9880,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19663,7 +20398,7 @@
+@@ -19664,7 +20410,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -10812,7 +9889,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19674,7 +20409,7 @@
+@@ -19675,7 +20421,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -10821,7 +9898,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19736,22 +20471,19 @@
+@@ -19737,22 +20483,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'
@@ -10850,7 +9927,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,
-@@ -19761,6 +20493,30 @@
+@@ -19762,6 +20505,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10881,7 +9958,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19770,7 +20526,7 @@
+@@ -19771,7 +20538,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -10890,7 +9967,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19799,7 +20555,11 @@
+@@ -19800,7 +20567,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -10903,7 +9980,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
-@@ -19819,7 +20579,7 @@
+@@ -19820,7 +20591,7 @@
os2*)
libname_spec='$name'
@@ -10912,7 +9989,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19921,8 +20681,8 @@
+@@ -19922,8 +20693,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -10923,7 +10000,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20048,8 +20808,7 @@
+@@ -20049,8 +20820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10933,7 +10010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20152,8 +20911,7 @@
+@@ -20153,8 +20923,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10943,7 +10020,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20218,8 +20976,7 @@
+@@ -20219,8 +20988,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10953,7 +10030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20312,8 +21069,7 @@
+@@ -20313,8 +21081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10963,7 +10040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20378,8 +21134,7 @@
+@@ -20379,8 +21146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10973,7 +10050,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20445,8 +21200,7 @@
+@@ -20446,8 +21212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10983,7 +10060,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20512,8 +21266,7 @@
+@@ -20513,8 +21278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10993,16 +10070,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20588,7 +21341,7 @@
+@@ -20589,7 +21353,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20591 "configure"
-+#line 21344 "configure"
+-#line 20592 "configure"
++#line 21356 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20654,7 +21407,7 @@
+@@ -20655,7 +21419,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -11011,16 +10088,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20686,7 +21439,7 @@
+@@ -20687,7 +21451,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20689 "configure"
-+#line 21442 "configure"
+-#line 20690 "configure"
++#line 21454 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20752,7 +21505,7 @@
+@@ -20753,7 +21517,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -11029,7 +10106,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20803,7 +21556,8 @@
+@@ -20804,7 +21568,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.
@@ -11039,7 +10116,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 \
-@@ -20903,6 +21657,12 @@
+@@ -20904,6 +21669,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -11052,7 +10129,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20933,7 +21693,7 @@
+@@ -20934,7 +21705,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -11061,7 +10138,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20964,7 +21724,7 @@
+@@ -20965,7 +21736,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -11070,7 +10147,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20979,7 +21739,7 @@
+@@ -20980,7 +21751,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -11079,7 +10156,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21181,7 +21941,10 @@
+@@ -21182,7 +21953,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.
@@ -11091,7 +10168,7 @@
fi
-@@ -21224,11 +21987,35 @@
+@@ -21225,11 +21999,35 @@
compiler=$CC
@@ -11127,7 +10204,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21244,7 +22031,8 @@
+@@ -21245,7 +22043,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.
@@ -11137,7 +10214,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 \
-@@ -21344,6 +22132,12 @@
+@@ -21345,6 +22144,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -11150,7 +10227,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21374,7 +22168,7 @@
+@@ -21375,7 +22180,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -11159,7 +10236,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21405,7 +22199,7 @@
+@@ -21406,7 +22211,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -11168,7 +10245,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21420,7 +22214,7 @@
+@@ -21421,7 +22226,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -11177,7 +10254,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21622,7 +22416,10 @@
+@@ -21623,7 +22428,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.
@@ -11189,7 +10266,7 @@
fi
-@@ -21669,7 +22466,7 @@
+@@ -21670,7 +22478,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -11198,7 +10275,7 @@
# Prevent multiple expansion
-@@ -22110,8 +22907,7 @@
+@@ -22111,8 +22919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11208,7 +10285,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22208,8 +23004,7 @@
+@@ -22209,8 +23016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11218,7 +10295,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22278,8 +23073,7 @@
+@@ -22279,8 +23085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11228,7 +10305,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22382,8 +23176,7 @@
+@@ -22383,8 +23188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11238,7 +10315,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22452,8 +23245,7 @@
+@@ -22453,8 +23257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11248,7 +10325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22528,8 +23320,7 @@
+@@ -22529,8 +23332,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11258,7 +10335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22636,8 +23427,7 @@
+@@ -22637,8 +23439,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11268,7 +10345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22908,8 +23698,7 @@
+@@ -22909,8 +23710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11278,7 +10355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23059,8 +23848,7 @@
+@@ -23060,8 +23860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11288,7 +10365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23245,8 +24033,7 @@
+@@ -23246,8 +24045,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11298,7 +10375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23348,8 +24135,7 @@
+@@ -23349,8 +24147,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11308,7 +10385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23451,8 +24237,7 @@
+@@ -23452,8 +24249,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11318,7 +10395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23553,8 +24338,7 @@
+@@ -23554,8 +24350,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11328,7 +10405,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23845,8 +24629,7 @@
+@@ -23846,8 +24641,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11338,7 +10415,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23911,8 +24694,7 @@
+@@ -23912,8 +24706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11348,7 +10425,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23976,8 +24758,7 @@
+@@ -23977,8 +24770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11358,7 +10435,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24058,8 +24839,7 @@
+@@ -24059,8 +24851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11368,7 +10445,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24200,8 +24980,7 @@
+@@ -24201,8 +24992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11378,7 +10455,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24339,8 +25118,7 @@
+@@ -24340,8 +25130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11388,7 +10465,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24524,8 +25302,7 @@
+@@ -24525,8 +25314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11398,7 +10475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24771,8 +25548,7 @@
+@@ -24772,8 +25560,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11408,7 +10485,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24965,8 +25741,7 @@
+@@ -24966,8 +25753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11418,7 +10495,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25047,8 +25822,7 @@
+@@ -25048,8 +25834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11428,7 +10505,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25118,8 +25892,7 @@
+@@ -25119,8 +25904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11438,7 +10515,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25228,8 +26001,7 @@
+@@ -25229,8 +26013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11448,7 +10525,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25321,8 +26093,7 @@
+@@ -25322,8 +26105,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11458,7 +10535,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25394,8 +26165,7 @@
+@@ -25395,8 +26177,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11468,7 +10545,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25449,8 +26219,7 @@
+@@ -25450,8 +26231,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11478,7 +10555,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25521,8 +26290,7 @@
+@@ -25522,8 +26302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11488,7 +10565,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25576,8 +26344,7 @@
+@@ -25577,8 +26356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11498,7 +10575,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25644,8 +26411,7 @@
+@@ -25645,8 +26423,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11508,7 +10585,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25790,7 +26556,8 @@
+@@ -25791,7 +26568,8 @@
@@ -11518,7 +10595,7 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -25823,8 +26590,7 @@
+@@ -25824,8 +26602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11528,7 +10605,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25998,8 +26764,7 @@
+@@ -25999,8 +26776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11538,7 +10615,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26165,8 +26930,7 @@
+@@ -26166,8 +26942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11548,7 +10625,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26342,8 +27106,7 @@
+@@ -26343,8 +27118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11558,7 +10635,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26423,8 +27186,7 @@
+@@ -26424,8 +27198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11568,7 +10645,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26592,8 +27354,7 @@
+@@ -26593,8 +27366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11578,7 +10655,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26671,8 +27432,7 @@
+@@ -26672,8 +27444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11588,7 +10665,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26850,9 +27610,6 @@
+@@ -26851,9 +27622,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11598,7 +10675,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26886,8 +27643,7 @@
+@@ -26887,8 +27655,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11608,7 +10685,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26991,8 +27747,7 @@
+@@ -26992,8 +27759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11618,7 +10695,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27071,9 +27826,6 @@
+@@ -27072,9 +27838,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11628,7 +10705,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27106,8 +27858,7 @@
+@@ -27107,8 +27870,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11638,7 +10715,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27210,8 +27961,7 @@
+@@ -27211,8 +27973,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11648,7 +10725,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27301,8 +28051,7 @@
+@@ -27302,8 +28063,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11658,7 +10735,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27363,8 +28112,7 @@
+@@ -27364,8 +28124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11668,7 +10745,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27432,8 +28180,7 @@
+@@ -27433,8 +28192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11678,7 +10755,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27499,8 +28246,7 @@
+@@ -27500,8 +28258,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11688,7 +10765,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27593,8 +28339,7 @@
+@@ -27594,8 +28351,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11698,7 +10775,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27672,8 +28417,7 @@
+@@ -27673,8 +28429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11708,7 +10785,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27757,8 +28501,7 @@
+@@ -27758,8 +28513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11718,7 +10795,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27826,8 +28569,7 @@
+@@ -27827,8 +28581,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11728,7 +10805,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27922,8 +28664,7 @@
+@@ -27923,8 +28676,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11738,7 +10815,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27987,8 +28728,7 @@
+@@ -27988,8 +28740,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11748,7 +10825,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28083,8 +28823,7 @@
+@@ -28084,8 +28835,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11758,7 +10835,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28148,8 +28887,7 @@
+@@ -28149,8 +28899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11768,7 +10845,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28245,8 +28983,7 @@
+@@ -28246,8 +28995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11778,7 +10855,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28310,8 +29047,7 @@
+@@ -28311,8 +29059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11788,7 +10865,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28408,8 +29144,7 @@
+@@ -28409,8 +29156,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11798,7 +10875,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28474,8 +29209,7 @@
+@@ -28475,8 +29221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11808,7 +10885,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28543,8 +29277,7 @@
+@@ -28544,8 +29289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11818,7 +10895,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28695,8 +29428,7 @@
+@@ -28696,8 +29440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11828,7 +10905,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28851,8 +29583,7 @@
+@@ -28852,8 +29595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11838,7 +10915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28917,8 +29648,7 @@
+@@ -28918,8 +29660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11848,7 +10925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29065,8 +29795,7 @@
+@@ -29066,8 +29807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11858,7 +10935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29221,8 +29950,7 @@
+@@ -29222,8 +29962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11868,7 +10945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29278,9 +30006,6 @@
+@@ -29279,9 +30018,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11878,7 +10955,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29314,8 +30039,7 @@
+@@ -29315,8 +30051,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11888,7 +10965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29419,8 +30143,7 @@
+@@ -29420,8 +30155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11898,7 +10975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29520,8 +30243,7 @@
+@@ -29521,8 +30255,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11908,7 +10985,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29595,8 +30317,7 @@
+@@ -29596,8 +30329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11918,7 +10995,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29659,8 +30380,7 @@
+@@ -29660,8 +30392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11928,7 +11005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29722,8 +30442,7 @@
+@@ -29723,8 +30454,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11938,7 +11015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29763,8 +30482,7 @@
+@@ -29764,8 +30494,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11948,7 +11025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29820,8 +30538,7 @@
+@@ -29821,8 +30550,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11958,7 +11035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29861,8 +30578,7 @@
+@@ -29862,8 +30590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11968,7 +11045,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29926,8 +30642,7 @@
+@@ -29927,8 +30654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11978,7 +11055,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29958,10 +30673,8 @@
+@@ -29959,10 +30685,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11991,7 +11068,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30072,8 +30785,7 @@
+@@ -30073,8 +30797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12001,7 +11078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30135,8 +30847,7 @@
+@@ -30136,8 +30859,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12011,7 +11088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30176,8 +30887,7 @@
+@@ -30177,8 +30899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12021,7 +11098,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30233,8 +30943,7 @@
+@@ -30234,8 +30955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12031,7 +11108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30274,8 +30983,7 @@
+@@ -30275,8 +30995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12041,7 +11118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30339,8 +31047,7 @@
+@@ -30340,8 +31059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12051,7 +11128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30371,10 +31078,8 @@
+@@ -30372,10 +31090,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -12064,7 +11141,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30485,8 +31190,7 @@
+@@ -30486,8 +31202,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12074,7 +11151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30548,8 +31252,7 @@
+@@ -30549,8 +31264,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12084,7 +11161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30589,8 +31292,7 @@
+@@ -30590,8 +31304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12094,7 +11171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30646,8 +31348,7 @@
+@@ -30647,8 +31360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12104,7 +11181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30687,8 +31388,7 @@
+@@ -30688,8 +31400,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12114,7 +11191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30752,8 +31452,7 @@
+@@ -30753,8 +31464,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12124,7 +11201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30784,10 +31483,8 @@
+@@ -30785,10 +31495,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -12137,7 +11214,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30898,8 +31595,7 @@
+@@ -30899,8 +31607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12147,7 +11224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30961,8 +31657,7 @@
+@@ -30962,8 +31669,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12157,7 +11234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31002,8 +31697,7 @@
+@@ -31003,8 +31709,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12167,7 +11244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31059,8 +31753,7 @@
+@@ -31060,8 +31765,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12177,7 +11254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31100,8 +31793,7 @@
+@@ -31101,8 +31805,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12187,7 +11264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31165,8 +31857,7 @@
+@@ -31166,8 +31869,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12197,7 +11274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31197,10 +31888,8 @@
+@@ -31198,10 +31900,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -12210,7 +11287,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31319,8 +32008,7 @@
+@@ -31320,8 +32020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12220,7 +11297,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31391,8 +32079,7 @@
+@@ -31392,8 +32091,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12230,7 +11307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31462,8 +32149,7 @@
+@@ -31463,8 +32161,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12240,7 +11317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31525,8 +32211,7 @@
+@@ -31526,8 +32223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12250,7 +11327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31566,8 +32251,7 @@
+@@ -31567,8 +32263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12260,7 +11337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31623,8 +32307,7 @@
+@@ -31624,8 +32319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12270,7 +11347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31664,8 +32347,7 @@
+@@ -31665,8 +32359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12280,7 +11357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31729,8 +32411,7 @@
+@@ -31730,8 +32423,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12290,7 +11367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31761,10 +32442,8 @@
+@@ -31762,10 +32454,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -12303,7 +11380,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31876,8 +32555,7 @@
+@@ -31877,8 +32567,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12313,7 +11390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31939,8 +32617,7 @@
+@@ -31940,8 +32629,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12323,7 +11400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31980,8 +32657,7 @@
+@@ -31981,8 +32669,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12333,7 +11410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32037,8 +32713,7 @@
+@@ -32038,8 +32725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12343,7 +11420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32078,8 +32753,7 @@
+@@ -32079,8 +32765,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12353,7 +11430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32143,8 +32817,7 @@
+@@ -32144,8 +32829,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12363,7 +11440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32175,10 +32848,8 @@
+@@ -32176,10 +32860,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -12376,7 +11453,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32289,8 +32960,7 @@
+@@ -32290,8 +32972,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12386,7 +11463,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32371,8 +33041,7 @@
+@@ -32372,8 +33053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12396,7 +11473,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32472,8 +33141,7 @@
+@@ -32473,8 +33153,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12406,7 +11483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32653,8 +33321,7 @@
+@@ -32654,8 +33333,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12416,7 +11493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32763,8 +33430,7 @@
+@@ -32764,8 +33442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12426,7 +11503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32988,8 +33654,7 @@
+@@ -32989,8 +33666,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12436,7 +11513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33212,8 +33877,7 @@
+@@ -33213,8 +33889,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12446,7 +11523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33289,8 +33953,7 @@
+@@ -33290,8 +33965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12456,7 +11533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33516,8 +34179,7 @@
+@@ -33517,8 +34191,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12466,7 +11543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33592,8 +34254,7 @@
+@@ -33593,8 +34266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12476,7 +11553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33653,8 +34314,7 @@
+@@ -33654,8 +34326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12486,7 +11563,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33737,8 +34397,7 @@
+@@ -33738,8 +34409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12496,7 +11573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33831,8 +34490,7 @@
+@@ -33832,8 +34502,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12506,7 +11583,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34006,8 +34664,7 @@
+@@ -34007,8 +34676,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12516,7 +11593,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34105,8 +34762,7 @@
+@@ -34106,8 +34774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12526,7 +11603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34193,8 +34849,7 @@
+@@ -34194,8 +34861,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12536,7 +11613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34271,8 +34926,7 @@
+@@ -34272,8 +34938,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12546,25 +11623,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34325,7 +34979,7 @@
+@@ -34326,7 +34991,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 34328: $i/$j" >&5
-+ echo "configure: 34982: $i/$j" >&5
+- echo "configure: 34329: $i/$j" >&5
++ echo "configure: 34994: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34623,7 +35277,7 @@
+@@ -34624,7 +35289,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 34626: $i/$j" >&5
-+ echo "configure: 35280: $i/$j" >&5
+- echo "configure: 34627: $i/$j" >&5
++ echo "configure: 35292: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -35300,8 +35954,7 @@
+@@ -35301,8 +35966,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12574,34 +11651,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35459,7 +36112,7 @@
+@@ -35460,7 +36124,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 35462: $i/$j" >&5
-+ echo "configure: 36115: $i/$j" >&5
+- echo "configure: 35463: $i/$j" >&5
++ echo "configure: 36127: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -35489,7 +36142,7 @@
+@@ -35490,7 +36154,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 35492: $i/$j" >&5
-+ echo "configure: 36145: $i/$j" >&5
+- echo "configure: 35493: $i/$j" >&5
++ echo "configure: 36157: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -35507,7 +36160,7 @@
+@@ -35508,7 +36172,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 35510: $i/$j" >&5
-+ echo "configure: 36163: $i/$j" >&5
+- echo "configure: 35511: $i/$j" >&5
++ echo "configure: 36175: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -35795,8 +36448,7 @@
+@@ -35796,8 +36460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12611,7 +11688,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35891,8 +36543,7 @@
+@@ -35892,8 +36555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12621,7 +11698,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35985,8 +36636,7 @@
+@@ -35986,8 +36648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12631,16 +11708,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37360,7 +38010,7 @@
+@@ -37361,7 +38022,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 37363: $i/$j" >&5
-+ echo "configure: 38013: $i/$j" >&5
+- echo "configure: 37364: $i/$j" >&5
++ echo "configure: 38025: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -37597,8 +38247,7 @@
+@@ -37598,8 +38259,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12650,7 +11727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37682,8 +38331,7 @@
+@@ -37683,8 +38343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12660,7 +11737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37775,8 +38423,7 @@
+@@ -37776,8 +38435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12670,7 +11747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37943,8 +38590,7 @@
+@@ -37944,8 +38602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12680,7 +11757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38099,8 +38745,7 @@
+@@ -38100,8 +38757,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12690,7 +11767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38175,8 +38820,7 @@
+@@ -38176,8 +38832,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12700,7 +11777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38218,8 +38862,7 @@
+@@ -38219,8 +38874,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12710,7 +11787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38276,8 +38919,7 @@
+@@ -38277,8 +38931,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12720,7 +11797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38407,9 +39049,6 @@
+@@ -38408,9 +39061,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12730,7 +11807,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38440,8 +39079,7 @@
+@@ -38441,8 +39091,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12740,7 +11817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38542,8 +39180,7 @@
+@@ -38543,8 +39192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12750,7 +11827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38622,9 +39259,6 @@
+@@ -38623,9 +39271,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12760,7 +11837,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38655,8 +39289,7 @@
+@@ -38656,8 +39301,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12770,7 +11847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38757,8 +39390,7 @@
+@@ -38758,8 +39402,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12780,7 +11857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38837,9 +39469,6 @@
+@@ -38838,9 +39481,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12790,7 +11867,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38872,8 +39501,7 @@
+@@ -38873,8 +39513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12800,7 +11877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38976,8 +39604,7 @@
+@@ -38977,8 +39616,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12810,7 +11887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39055,9 +39682,6 @@
+@@ -39056,9 +39694,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12820,7 +11897,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39090,8 +39714,7 @@
+@@ -39091,8 +39726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12830,7 +11907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39194,8 +39817,7 @@
+@@ -39195,8 +39829,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12840,7 +11917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39275,9 +39897,6 @@
+@@ -39276,9 +39909,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12850,7 +11927,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39311,8 +39930,7 @@
+@@ -39312,8 +39942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12860,7 +11937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39416,8 +40034,7 @@
+@@ -39417,8 +40046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12870,7 +11947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39496,9 +40113,6 @@
+@@ -39497,9 +40125,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12880,7 +11957,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39532,8 +40146,7 @@
+@@ -39533,8 +40158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12890,7 +11967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39637,8 +40250,7 @@
+@@ -39638,8 +40262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12900,7 +11977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39717,9 +40329,6 @@
+@@ -39718,9 +40341,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12910,7 +11987,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39753,8 +40362,7 @@
+@@ -39754,8 +40374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12920,7 +11997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39858,8 +40466,7 @@
+@@ -39859,8 +40478,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12930,7 +12007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39925,7 +40532,9 @@
+@@ -39926,7 +40544,9 @@
@@ -12941,7 +12018,7 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39993,8 +40602,7 @@
+@@ -39994,8 +40614,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12951,7 +12028,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40052,9 +40660,6 @@
+@@ -40053,9 +40672,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12961,7 +12038,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40087,8 +40692,7 @@
+@@ -40088,8 +40704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12971,7 +12048,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40191,8 +40795,7 @@
+@@ -40192,8 +40807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12981,7 +12058,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40271,9 +40874,6 @@
+@@ -40272,9 +40886,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -12991,7 +12068,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40308,8 +40908,7 @@
+@@ -40309,8 +40920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13001,7 +12078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40414,8 +41013,7 @@
+@@ -40415,8 +41025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13011,7 +12088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40494,9 +41092,6 @@
+@@ -40495,9 +41104,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -13021,7 +12098,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40529,8 +41124,7 @@
+@@ -40530,8 +41136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13031,7 +12108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40633,8 +41227,7 @@
+@@ -40634,8 +41239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13041,7 +12118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40712,9 +41305,6 @@
+@@ -40713,9 +41317,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -13051,7 +12128,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40747,8 +41337,7 @@
+@@ -40748,8 +41349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13061,7 +12138,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40851,8 +41440,7 @@
+@@ -40852,8 +41452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13071,7 +12148,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40946,8 +41534,7 @@
+@@ -40947,8 +41546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13081,7 +12158,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41007,9 +41594,6 @@
+@@ -41008,9 +41606,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -13091,7 +12168,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41045,8 +41629,7 @@
+@@ -41046,8 +41641,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13101,7 +12178,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41152,8 +41735,7 @@
+@@ -41153,8 +41747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13111,7 +12188,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41411,8 +41993,7 @@
+@@ -41412,8 +42005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13121,7 +12198,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41532,8 +42113,7 @@
+@@ -41533,8 +42125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13131,7 +12208,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41714,8 +42294,7 @@
+@@ -41715,8 +42306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13141,16 +12218,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41775,7 +42354,7 @@
+@@ -41776,7 +42366,7 @@
do
for j in qsql.html;
do
-- echo "configure: 41778: $i/$j" >&5
-+ echo "configure: 42357: $i/$j" >&5
+- echo "configure: 41779: $i/$j" >&5
++ echo "configure: 42369: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41970,8 +42549,7 @@
+@@ -41971,8 +42561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13160,7 +12237,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42155,109 +42733,270 @@
+@@ -42156,109 +42745,270 @@
#MIN_CONFIG
@@ -13365,18 +12442,18 @@
echo "${ECHO_T}no" >&6
- LIB_DNSSD=""
+fi
-
++
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
+
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-CPPFLAGS=$save_dnssdtest_CPPFLAGS
-LDFLAGS=$save_dnssdtest_LDFLAGS
-LIBS=$save_dnssdtest_LIBS
-+
-+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
@@ -13512,7 +12589,7 @@
-@@ -42343,8 +43082,7 @@
+@@ -42344,8 +43094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13522,7 +12599,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42490,8 +43228,7 @@
+@@ -42491,8 +43240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13532,7 +12609,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42649,8 +43386,7 @@
+@@ -42650,8 +43398,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13542,7 +12619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42716,8 +43452,7 @@
+@@ -42717,8 +43464,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13552,7 +12629,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42917,8 +43652,7 @@
+@@ -42918,8 +43664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13562,7 +12639,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43080,8 +43814,7 @@
+@@ -43081,8 +43826,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13572,7 +12649,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43214,8 +43947,7 @@
+@@ -43215,8 +43959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13582,7 +12659,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43284,8 +44016,7 @@
+@@ -43285,8 +44028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13592,7 +12669,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43373,8 +44104,7 @@
+@@ -43374,8 +44116,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13602,7 +12679,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43464,8 +44194,7 @@
+@@ -43465,8 +44206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13612,17 +12689,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43590,7 +44319,8 @@
-
-
-
--for ac_func in usleep poll
-+
-+for ac_func in usleep poll madvise
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -43658,8 +44388,7 @@
+@@ -43660,8 +44400,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13632,7 +12699,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43725,8 +44454,7 @@
+@@ -43727,8 +44466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13642,7 +12709,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43830,8 +44558,7 @@
+@@ -43832,8 +44570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13652,7 +12719,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43932,8 +44659,7 @@
+@@ -43934,8 +44671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13662,7 +12729,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44088,8 +44814,7 @@
+@@ -44090,8 +44826,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13672,7 +12739,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44133,8 +44858,7 @@
+@@ -44135,8 +44870,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13682,7 +12749,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44202,8 +44926,7 @@
+@@ -44204,8 +44938,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13692,7 +12759,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44264,8 +44987,7 @@
+@@ -44266,8 +44999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13702,7 +12769,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44309,8 +45031,7 @@
+@@ -44311,8 +45043,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13712,7 +12779,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44378,8 +45099,7 @@
+@@ -44380,8 +45111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13722,7 +12789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44445,8 +45165,7 @@
+@@ -44447,8 +45177,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13732,7 +12799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44732,8 +45451,7 @@
+@@ -44734,8 +45463,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13742,7 +12809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44878,8 +45596,7 @@
+@@ -44880,8 +45608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13752,7 +12819,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45013,8 +45730,7 @@
+@@ -45015,8 +45742,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13762,7 +12829,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45160,8 +45876,7 @@
+@@ -45162,8 +45888,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13772,7 +12839,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45252,8 +45967,7 @@
+@@ -45254,8 +45979,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13782,7 +12849,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45422,8 +46136,7 @@
+@@ -45424,8 +46148,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13792,7 +12859,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45494,8 +46207,7 @@
+@@ -45496,8 +46219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13802,7 +12869,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45547,8 +46259,7 @@
+@@ -45549,8 +46271,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13812,7 +12879,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45600,8 +46311,7 @@
+@@ -45602,8 +46323,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13822,7 +12889,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45653,8 +46363,7 @@
+@@ -45655,8 +46375,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13832,7 +12899,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45710,8 +46419,7 @@
+@@ -45712,8 +46431,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13842,7 +12909,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45855,8 +46563,7 @@
+@@ -45857,8 +46575,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13852,7 +12919,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45927,8 +46634,7 @@
+@@ -45929,8 +46646,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13862,7 +12929,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46266,8 +46972,7 @@
+@@ -46268,8 +46984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13872,7 +12939,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46370,8 +47075,7 @@
+@@ -46372,8 +47087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13882,7 +12949,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46440,8 +47144,7 @@
+@@ -46442,8 +47156,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13892,7 +12959,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46594,8 +47297,7 @@
+@@ -46596,8 +47309,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13902,7 +12969,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46705,8 +47407,7 @@
+@@ -46707,8 +47419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13912,7 +12979,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46811,8 +47512,7 @@
+@@ -46813,8 +47524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13922,7 +12989,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46879,8 +47579,7 @@
+@@ -46881,8 +47591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13932,7 +12999,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46982,8 +47681,7 @@
+@@ -46984,8 +47693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13942,7 +13009,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47316,8 +48014,7 @@
+@@ -47318,8 +48026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13952,7 +13019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47406,8 +48103,7 @@
+@@ -47408,8 +48115,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13962,7 +13029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47496,8 +48192,7 @@
+@@ -47498,8 +48204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13972,7 +13039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47591,8 +48286,7 @@
+@@ -47593,8 +48298,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13982,7 +13049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47765,8 +48459,7 @@
+@@ -47767,8 +48471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13992,7 +13059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47896,8 +48589,7 @@
+@@ -47898,8 +48601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14002,7 +13069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47993,8 +48685,7 @@
+@@ -47995,8 +48697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14012,7 +13079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48112,8 +48803,7 @@
+@@ -48114,8 +48815,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14022,7 +13089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48190,8 +48880,7 @@
+@@ -48192,8 +48892,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14032,16 +13099,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48244,7 +48933,7 @@
+@@ -48246,7 +48945,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 48247: $i/$j" >&5
-+ echo "configure: 48936: $i/$j" >&5
+- echo "configure: 48249: $i/$j" >&5
++ echo "configure: 48948: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -48337,8 +49026,7 @@
+@@ -48339,8 +49038,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14051,7 +13118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48434,8 +49122,7 @@
+@@ -48436,8 +49134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14061,7 +13128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48607,8 +49294,7 @@
+@@ -48609,8 +49306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14071,7 +13138,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48742,8 +49428,7 @@
+@@ -48744,8 +49440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14081,7 +13148,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49035,8 +49720,7 @@
+@@ -49037,8 +49732,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14091,7 +13158,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49245,8 +49929,7 @@
+@@ -49247,8 +49941,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14101,7 +13168,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49341,8 +50024,7 @@
+@@ -49343,8 +50036,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14111,7 +13178,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49432,8 +50114,7 @@
+@@ -49434,8 +50126,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14121,7 +13188,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49618,8 +50299,7 @@
+@@ -49620,8 +50311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14131,7 +13198,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49694,8 +50374,7 @@
+@@ -49696,8 +50386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14141,7 +13208,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49832,8 +50511,7 @@
+@@ -49834,8 +50523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14151,166 +13218,26 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49878,6 +50556,149 @@
- fi
-
-
-+# Check whether --enable-inotify or --disable-inotify was given.
-+if test "${enable_inotify+set}" = set; then
-+ enableval="$enable_inotify"
-+ kde_enable_inotify=$enableval
-+else
-+ kde_enable_inotify=yes
-+fi;
-+
-+echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
-+echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6
-+if test "${ac_cv_gnu_extensions+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat > conftest.c << EOF
-+#include <features.h>
-+
-+#ifdef __GNU_LIBRARY__
-+yes
-+#endif
-+EOF
-+
-+if (eval "$ac_cpp conftest.c") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ac_cv_gnu_extensions=yes
-+else
-+ ac_cv_gnu_extensions=no
-+fi
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $ac_cv_gnu_extensions" >&5
-+echo "${ECHO_T}$ac_cv_gnu_extensions" >&6
-+if test "$ac_cv_gnu_extensions" = "yes"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define _GNU_SOURCE 1
-+_ACEOF
-+
-+fi
-+
-+
-+if test "x$kde_enable_inotify" = "xyes"; then
-+ echo "$as_me:$LINENO: checking for Linux Inotify Notification" >&5
-+echo $ECHO_N "checking for Linux Inotify Notification... $ECHO_C" >&6
-+ if test "${kde_cv_have_inotify+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+ kde_cv_have_inotify=no
-+
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <asm/unistd.h>
-+#define _S390_BITOPS_H
-+#include <linux/inotify.h>
-+
-+int
-+main ()
-+{
-+
-+#ifndef IN_ALL_EVENTS
-+#error no inotify notification
-+#endif
-+#ifndef __NR_inotify_init
-+#error no __NR_inotify_init
-+#endif
-+
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+@@ -49977,8 +50665,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ kde_cv_have_inotify=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_have_inotify=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+
-+ if test "$kde_cv_have_inotify" = "yes" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_INOTIFY 1
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+fi
-+
-+
- LIBSSL="-lssl -lcrypto"
-
-
-@@ -49919,7 +50740,7 @@
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -50065,7 +50752,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 49922: $i/$j" >&5
-+ echo "configure: 50743: $i/$j" >&5
+- echo "configure: 50068: $i/$j" >&5
++ echo "configure: 50755: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -49974,8 +50795,7 @@
+@@ -50120,8 +50807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14320,7 +13247,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50275,8 +51095,7 @@
+@@ -50421,8 +51107,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14330,7 +13257,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50496,8 +51315,7 @@
+@@ -50642,8 +51327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14340,25 +13267,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50650,7 +51468,7 @@
+@@ -50796,7 +51480,7 @@
do
for j in gssapi.h;
do
-- echo "configure: 50653: $i/$j" >&5
-+ echo "configure: 51471: $i/$j" >&5
+- echo "configure: 50799: $i/$j" >&5
++ echo "configure: 51483: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_incdir=$i
-@@ -50672,7 +51490,7 @@
+@@ -50818,7 +51502,7 @@
do
for j in libgssapi.$ext;
do
-- echo "configure: 50675: $i/$j" >&5
-+ echo "configure: 51493: $i/$j" >&5
+- echo "configure: 50821: $i/$j" >&5
++ echo "configure: 51505: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_libdir=$i
-@@ -50790,8 +51608,7 @@
+@@ -50936,8 +51620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14368,7 +13295,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50944,8 +51761,7 @@
+@@ -51090,8 +51773,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14378,7 +13305,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51018,8 +51834,7 @@
+@@ -51164,8 +51846,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14388,7 +13315,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51092,8 +51907,7 @@
+@@ -51238,8 +51919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14398,7 +13325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51166,8 +51980,7 @@
+@@ -51312,8 +51992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14408,7 +13335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51317,8 +52130,7 @@
+@@ -51463,8 +52142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14418,7 +13345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51438,8 +52250,7 @@
+@@ -51584,8 +52262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14428,7 +13355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51515,8 +52326,7 @@
+@@ -51661,8 +52338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14438,7 +13365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51723,8 +52533,7 @@
+@@ -51869,8 +52545,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14448,7 +13375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51800,8 +52609,7 @@
+@@ -51946,8 +52621,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14458,7 +13385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52017,8 +52825,7 @@
+@@ -52163,8 +52837,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14468,7 +13395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52185,8 +52992,7 @@
+@@ -52331,8 +53004,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14478,7 +13405,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52351,8 +53157,7 @@
+@@ -52497,8 +53169,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14488,7 +13415,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52413,8 +53218,7 @@
+@@ -52559,8 +53230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14498,7 +13425,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52481,8 +53285,7 @@
+@@ -52627,8 +53297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14508,7 +13435,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52562,8 +53365,7 @@
+@@ -52708,8 +53377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14518,7 +13445,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53575,6 +54377,13 @@
+@@ -53721,6 +54389,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -14532,7 +13459,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
-@@ -53638,13 +54447,6 @@
+@@ -53784,13 +54459,6 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -14546,28 +13473,17 @@
if test -z "${include_SVGICONS_TRUE}" && test -z "${include_SVGICONS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -54768,6 +55570,7 @@
- s, at AUTOMAKE@,$AUTOMAKE,;t t
- s, at AUTOHEADER@,$AUTOHEADER,;t t
- s, at MAKEINFO@,$MAKEINFO,;t t
-+s, at AMTAR@,$AMTAR,;t t
- s, at install_sh@,$install_sh,;t t
- s, at STRIP@,$STRIP,;t t
- s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-@@ -54776,9 +55579,9 @@
- s, at AWK@,$AWK,;t t
- s, at SET_MAKE@,$SET_MAKE,;t t
- s, at am__leading_dot@,$am__leading_dot,;t t
--s, at AMTAR@,$AMTAR,;t t
--s, at am__tar@,$am__tar,;t t
--s, at am__untar@,$am__untar,;t t
+@@ -54925,6 +55593,9 @@
+ s, at AMTAR@,$AMTAR,;t t
+ s, at am__tar@,$am__tar,;t t
+ s, at am__untar@,$am__untar,;t t
+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s, at MAINT@,$MAINT,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -54972,9 +55775,11 @@
+@@ -55118,9 +55789,11 @@
s, at include_VERSION_SCRIPT_TRUE@,$include_VERSION_SCRIPT_TRUE,;t t
s, at include_VERSION_SCRIPT_FALSE@,$include_VERSION_SCRIPT_FALSE,;t t
s, at MD5SUM@,$MD5SUM,;t t
@@ -14582,7 +13498,7 @@
s, at LUA@,$LUA,;t t
s, at LUA_INCLUDES@,$LUA_INCLUDES,;t t
s, at LUA_LIBS@,$LUA_LIBS,;t t
-@@ -55008,7 +55813,6 @@
+@@ -55154,7 +55827,6 @@
s, at KJAVA_POLICYPATH@,$KJAVA_POLICYPATH,;t t
s, at LIBTIFF@,$LIBTIFF,;t t
s, at LIB_JASPER@,$LIB_JASPER,;t t
@@ -14590,7 +13506,7 @@
s, at LIB_EXR@,$LIB_EXR,;t t
s, at EXR_FLAGS@,$EXR_FLAGS,;t t
s, at include_TIFF_MODULES_TRUE@,$include_TIFF_MODULES_TRUE,;t t
-@@ -55286,11 +56090,6 @@
+@@ -55432,11 +56104,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -14602,7 +13518,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -55329,6 +56128,12 @@
+@@ -55475,6 +56142,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -14615,50 +13531,11 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-@@ -55742,21 +56547,27 @@
- else
- continue
- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-+ # Extract the definition of DEP_FILES from the Makefile without
-+ # running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-+ # We invoke sed twice because it is the simplest approach to
-+ # changing $(DEPDIR) to its actual value in the expansion.
-+ for file in `sed -n '
-+ /^DEP_FILES = .*\\\\$/ {
-+ s/^DEP_FILES = //
-+ :loop
-+ s/\\\\$//
-+ p
-+ n
-+ /\\\\$/ b loop
-+ p
-+ }
-+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
--- configure.in
+++ configure.in
@@ -23,6 +23,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdelibs, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdelibs, "3.5.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -14740,130 +13617,9 @@
dnl =======================================================
dnl FILE: ./kate/part/configure.in.in
dnl =======================================================
-@@ -707,7 +688,7 @@
-
- KDE_CHECK_HEADERS([netinet/in.h net/if.h],,,[$netincludes])
- KDE_CHECK_HEADERS([sys/filio.h])
--AC_CHECK_FUNCS([usleep poll])
-+AC_CHECK_FUNCS([usleep poll madvise])
-
- dnl Check for struct addrinfo
- AC_CHECK_TYPES([struct addrinfo],,,[$netincludes])
-@@ -1681,6 +1662,51 @@
- AC_MSG_RESULT(no)
- fi
- fi
-+
-+dnl ------------------------------------------------------------------------
-+dnl Try to find if we have Linux Inode based Dir Notification
-+dnl ------------------------------------------------------------------------
-+
-+AC_ARG_ENABLE(inotify,
-+AC_HELP_STRING([--enable-inotify],[enable use of Linux inode notifications]),
-+[ kde_enable_inotify=$enableval ], [kde_enable_inotify=yes])dnl
-+
-+AC_CHECK_GNU_EXTENSIONS
-+
-+if test "x$kde_enable_inotify" = "xyes"; then
-+ AC_MSG_CHECKING([for Linux Inotify Notification])
-+ AC_CACHE_VAL(kde_cv_have_inotify,
-+ [
-+ kde_cv_have_inotify=no
-+ AC_LANG_SAVE
-+ AC_LANG_C
-+
-+ AC_TRY_COMPILE(
-+ [
-+#include <asm/unistd.h>
-+#define _S390_BITOPS_H
-+#include <linux/inotify.h>
-+ ],
-+ [
-+#ifndef IN_ALL_EVENTS
-+#error no inotify notification
-+#endif
-+#ifndef __NR_inotify_init
-+#error no __NR_inotify_init
-+#endif
-+
-+ ],kde_cv_have_inotify=yes,kde_cv_have_inotify=no)
-+
-+ AC_LANG_RESTORE
-+ ])
-+
-+ if test "$kde_cv_have_inotify" = "yes" ; then
-+ AC_DEFINE_UNQUOTED(HAVE_INOTIFY, 1, [Define if your system has Linux Inode Notification])
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+fi
- dnl =======================================================
- dnl FILE: ./kio/kssl/configure.in.in
- dnl =======================================================
---- dcop/KDE-ICE/Makefile.in
-+++ dcop/KDE-ICE/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkICE_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -72,13 +74,36 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/accept.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/authutil.Plo ./$(DEPDIR)/connect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/error.Plo ./$(DEPDIR)/getauth.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/globals.Plo ./$(DEPDIR)/iceauth.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/listen.Plo ./$(DEPDIR)/listenwk.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/locking.Plo ./$(DEPDIR)/misc.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ping.Plo ./$(DEPDIR)/process.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/protosetup.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/register.Plo ./$(DEPDIR)/replywait.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/setauth.Plo ./$(DEPDIR)/shutdown.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/transport.Plo ./$(DEPDIR)/watch.Plo
-+#>+ 11
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/accept.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/authutil.Plo ./$(DEPDIR)/connect.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/error.Plo ./$(DEPDIR)/getauth.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/globals.Plo ./$(DEPDIR)/iceauth.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/listen.Plo ./$(DEPDIR)/listenwk.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/locking.Plo ./$(DEPDIR)/misc.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ping.Plo ./$(DEPDIR)/process.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/protosetup.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/register.Plo ./$(DEPDIR)/replywait.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/setauth.Plo ./$(DEPDIR)/shutdown.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/transport.Plo ./$(DEPDIR)/watch.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkICE_la_SOURCES)
- DIST_SOURCES = $(libkICE_la_SOURCES)
-@@ -100,6 +125,8 @@
+--- dcop/client/Makefile.in
++++ dcop/client/Makefile.in
+@@ -147,6 +147,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -14872,7 +13628,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -141,8 +168,6 @@
+@@ -188,8 +190,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -14881,7 +13637,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -219,7 +244,6 @@
+@@ -266,7 +266,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -14889,7 +13645,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -256,6 +280,9 @@
+@@ -303,6 +302,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14899,7 +13655,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -311,6 +338,7 @@
+@@ -358,6 +360,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -14907,16 +13663,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -320,8 +348,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -339,6 +365,7 @@
+@@ -386,6 +389,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -14924,16 +13671,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -537,7 +564,7 @@
+@@ -566,7 +570,7 @@
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +602,9 @@
+@@ -604,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14943,161 +13690,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -622,21 +649,24 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -747,7 +777,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- dcop/Makefile.in
-+++ dcop/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -40,6 +40,10 @@
-
-
-
-+#>- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
-+#>+ 1
-+SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -81,14 +85,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -143,39 +140,60 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I. -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dcop_deadlock_test.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po
-+#>+ 16
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/dcopserver.la.Po $(DEPDIR)/dcopserver_dummy.Plo $(DEPDIR)/libkdeinit_dcopserver_la.all_cpp.P $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P ./$(DEPDIR)/dcop_deadlock_test.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/dcopserver.la.Po $(DEPDIR)/dcopserver_dummy.Plo ./$(DEPDIR)/dcop_deadlock_test.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
--#>- $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
--#>- $(testdcop_SOURCES) $(testdcopc_SOURCES)
--#>+ 3
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
- $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
-- $(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES)
-+ $(testdcop_SOURCES) $(testdcopc_SOURCES)
- #>- DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
- #>- $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
- #>- $(testdcop_SOURCES) $(testdcopc_SOURCES)
-@@ -216,6 +234,8 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- dcop/dcopidl/Makefile.in
++++ dcop/dcopidl/Makefile.in
+@@ -108,6 +108,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -15106,7 +13703,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -257,8 +277,6 @@
+@@ -149,8 +151,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -15115,7 +13712,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -335,7 +353,6 @@
+@@ -227,7 +227,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -15123,7 +13720,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -372,6 +389,9 @@
+@@ -264,6 +263,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15133,7 +13730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,6 +447,7 @@
+@@ -319,6 +321,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -15141,16 +13738,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -436,8 +457,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -455,6 +474,7 @@
+@@ -347,6 +350,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -15158,16 +13746,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -655,7 +675,7 @@
+@@ -518,7 +522,7 @@
.SUFFIXES:
- .SUFFIXES: .c .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)
+ .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*) \
-@@ -693,9 +713,9 @@
+@@ -556,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15177,329 +13765,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- dcop-path.h: stamp-h2
-@@ -707,10 +727,6 @@
- stamp-h2: $(srcdir)/dcop-path.h.in $(top_builddir)/config.status
- @rm -f stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status dcop/dcop-path.h
--$(srcdir)/dcop-path.h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
-- rm -f stamp-h2
-- touch $@
-
- distclean-hdr:
- -rm -f dcop-path.h stamp-h2
-@@ -719,7 +735,7 @@
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -727,8 +743,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -746,7 +762,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -754,8 +770,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -848,42 +864,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -900,7 +922,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -908,7 +930,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -920,13 +942,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -938,7 +954,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -946,13 +962,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -973,7 +983,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1073,17 +1083,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1118,7 +1126,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1329,18 +1337,18 @@
- dcopserver_DEPENDENCIES = libkdeinit_dcopserver.la
-
- #>+ 3
--testdcop.moc: $(srcdir)/testdcop.h
-- $(MOC) $(srcdir)/testdcop.h -o testdcop.moc
-+dcopclient.moc: $(srcdir)/dcopclient.h
-+ $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
-
- #>+ 2
--mocs: testdcop.moc
-+mocs: dcopclient.moc
-
- #>+ 3
--dcopclient.moc: $(srcdir)/dcopclient.h
-- $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
-+testdcop.moc: $(srcdir)/testdcop.h
-+ $(MOC) $(srcdir)/testdcop.h -o testdcop.moc
-
- #>+ 2
--mocs: dcopclient.moc
-+mocs: testdcop.moc
-
- #>+ 3
- dcopserver.moc: $(srcdir)/dcopserver.h
-@@ -1372,7 +1380,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f testdcop.moc dcopclient.moc dcopserver.moc dcop_deadlock_test.moc
-+ -rm -f dcopclient.moc testdcop.moc dcopserver.moc dcop_deadlock_test.moc
-
- #>+ 2
- KDE_DIST=dcop-path.h.in dcopserver_shutdown_win.cpp configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h dcopserver_win.cpp Makefile.am libDCOP_weak.nmcheck
-@@ -1493,8 +1501,8 @@
-
- #>+ 18
- nmcheck: nmcheck_libDCOP.la
--dcopclient.lo: dcopclient.moc
- testdcop.o: testdcop.moc
-+dcopclient.lo: dcopclient.moc
- libkdeinit_dcopserver.la: $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkdeinit_dcopserver_la_LDFLAGS) $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_LIBADD) $(LIBS)
-
---- dcop/client/Makefile.in
-+++ dcop/client/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) $(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) $(dcopstart_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -98,32 +100,41 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dcop.Po ./$(DEPDIR)/dcopclient.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopfind.Po ./$(DEPDIR)/dcopobject.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopquit.Po ./$(DEPDIR)/dcopref.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopstart.Po
-+#>+ 4
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dcop.Po ./$(DEPDIR)/dcopclient.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopfind.Po ./$(DEPDIR)/dcopobject.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopquit.Po ./$(DEPDIR)/dcopref.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstart.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) \
- $(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) \
- $(dcopstart_SOURCES)
-@@ -147,6 +158,8 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- dcop/dcopidl2cpp/Makefile.in
++++ dcop/dcopidl2cpp/Makefile.in
+@@ -110,6 +110,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -15508,7 +13778,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -188,8 +201,6 @@
+@@ -151,8 +153,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -15517,7 +13787,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -266,7 +277,6 @@
+@@ -229,7 +229,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -15525,7 +13795,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -303,6 +313,9 @@
+@@ -266,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15535,7 +13805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -358,6 +371,7 @@
+@@ -321,6 +323,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -15543,16 +13813,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +381,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -386,6 +398,7 @@
+@@ -349,6 +352,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -15560,16 +13821,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -566,7 +579,7 @@
+@@ -517,7 +521,7 @@
.SUFFIXES:
- .SUFFIXES: .c .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*) \
-@@ -604,9 +617,9 @@
+@@ -555,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15581,132 +13842,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -676,42 +689,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -825,7 +844,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- dcop/dcopidl/Makefile.in
-+++ dcop/dcopidl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(dcopidl_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -70,24 +72,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/scanner.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/yacc.Po
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/dcopidl.all_cc.P ./$(DEPDIR)/main.Po ./$(DEPDIR)/scanner.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/yacc.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/scanner.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/yacc.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dcopidl_SOURCES)
- DIST_SOURCES = $(dcopidl_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -108,6 +117,8 @@
+--- dcop/dcopidlng/Makefile.in
++++ dcop/dcopidlng/Makefile.in
+@@ -83,6 +83,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -15715,7 +13853,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -149,8 +160,6 @@
+@@ -124,8 +126,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -15724,7 +13862,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -227,7 +236,6 @@
+@@ -202,7 +202,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -15732,7 +13870,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -264,6 +272,9 @@
+@@ -239,6 +238,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15742,7 +13880,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,6 +330,7 @@
+@@ -294,6 +296,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -15750,16 +13888,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -328,8 +340,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -347,6 +357,7 @@
+@@ -322,6 +325,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -15767,16 +13896,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -518,7 +529,7 @@
+@@ -487,7 +491,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*) \
-@@ -556,9 +567,9 @@
+@@ -525,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15786,134 +13915,20 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -606,42 +617,48 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+@@ -732,7 +736,7 @@
+ .NOEXPORT:
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ #>+ 2
+-KDE_DIST=kalyptus kalyptusCxxToDcopIDL.pm Ast.pm kdocParseDoc.pm Makefile.in Iter.pm kdocUtil.pm dcopidlng kdocAstUtil.pm Makefile.am run_test.sh
++KDE_DIST=kalyptus kalyptusCxxToDcopIDL.pm Ast.pm kdocParseDoc.pm Makefile.in Iter.pm dcopidlng kdocUtil.pm kdocAstUtil.pm Makefile.am run_test.sh
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -756,7 +773,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- dcop/dcopidl2cpp/Makefile.in
-+++ dcop/dcopidl2cpp/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(dcopidl2cpp_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -72,24 +74,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/skel.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/stub.Po ./$(DEPDIR)/stubimpl.Po
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/dcopidl2cpp.all_cpp.P ./$(DEPDIR)/main.Po ./$(DEPDIR)/skel.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/stub.Po ./$(DEPDIR)/stubimpl.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/skel.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/stub.Po ./$(DEPDIR)/stubimpl.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dcopidl2cpp_SOURCES)
- DIST_SOURCES = $(dcopidl2cpp_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -110,6 +119,8 @@
+ docs-am:
+--- dcop/KDE-ICE/Makefile.in
++++ dcop/KDE-ICE/Makefile.in
+@@ -100,6 +100,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -15922,7 +13937,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -151,8 +162,6 @@
+@@ -141,8 +143,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -15931,7 +13946,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -229,7 +238,6 @@
+@@ -219,7 +219,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -15939,7 +13954,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -266,6 +274,9 @@
+@@ -256,6 +255,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15949,7 +13964,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -321,6 +332,7 @@
+@@ -311,6 +313,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -15957,16 +13972,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -330,8 +342,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -349,6 +359,7 @@
+@@ -339,6 +342,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -15974,16 +13980,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -517,7 +528,7 @@
+@@ -537,7 +541,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +566,9 @@
+@@ -575,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15993,81 +13999,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -606,21 +617,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -735,7 +749,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- dcop/dcopidlng/Makefile.in
-+++ dcop/dcopidlng/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -53,19 +53,12 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dcopidlnglibdir)" \
-- "$(DESTDIR)$(dcopidlnglibdir)"
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dcopidlnglibdir)" "$(DESTDIR)$(dcopidlnglibdir)"
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- dcopidlnglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS) $(dcopidlnglib_SCRIPTS)
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- dcopidlnglibDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dcopidlnglib_DATA)
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -83,6 +76,8 @@
+ clean-noinstLTLIBRARIES:
+--- dcop/Makefile.in
++++ dcop/Makefile.in
+@@ -216,6 +216,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -16076,7 +14012,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -124,8 +119,6 @@
+@@ -257,8 +259,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -16085,7 +14021,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -202,7 +195,6 @@
+@@ -335,7 +335,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -16093,7 +14029,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -239,6 +231,9 @@
+@@ -372,6 +371,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16103,7 +14039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -294,6 +289,7 @@
+@@ -427,6 +429,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -16111,16 +14047,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -303,8 +299,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -322,6 +316,7 @@
+@@ -455,6 +458,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -16128,16 +14055,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -487,7 +482,7 @@
- all: docs-am all-am
+@@ -655,7 +659,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .c .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*) \
-@@ -525,9 +520,9 @@
+@@ -693,9 +697,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16147,103 +14074,64 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
-@@ -582,7 +577,7 @@
- test -z "$(dcopidlnglibdir)" || $(mkdir_p) "$(DESTDIR)$(dcopidlnglibdir)"
- @list='$(dcopidlnglib_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dcopidlnglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dcopidlnglibdir)/$$f'"; \
- $(dcopidlnglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dcopidlnglibdir)/$$f"; \
- done
-@@ -590,7 +585,7 @@
- uninstall-dcopidlnglibDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dcopidlnglib_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(dcopidlnglibdir)/$$f'"; \
- rm -f "$(DESTDIR)$(dcopidlnglibdir)/$$f"; \
- done
-@@ -655,7 +650,7 @@
- clean-generic:
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ dcop-path.h: stamp-h2
+@@ -707,7 +711,7 @@
+ stamp-h2: $(srcdir)/dcop-path.h.in $(top_builddir)/config.status
+ @rm -f stamp-h2
+ cd $(top_builddir) && $(SHELL) ./config.status dcop/dcop-path.h
+-$(srcdir)/dcop-path.h.in: $(am__configure_deps)
++$(srcdir)/dcop-path.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h2
+ touch $@
+@@ -1329,18 +1333,18 @@
+ dcopserver_DEPENDENCIES = libkdeinit_dcopserver.la
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -732,7 +727,7 @@
- .NOEXPORT:
+ #>+ 3
+-testdcop.moc: $(srcdir)/testdcop.h
+- $(MOC) $(srcdir)/testdcop.h -o testdcop.moc
++dcopclient.moc: $(srcdir)/dcopclient.h
++ $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
#>+ 2
--KDE_DIST=kalyptus kalyptusCxxToDcopIDL.pm Ast.pm kdocParseDoc.pm Makefile.in Iter.pm kdocUtil.pm dcopidlng kdocAstUtil.pm Makefile.am run_test.sh
-+KDE_DIST=kalyptus kalyptusCxxToDcopIDL.pm Ast.pm kdocParseDoc.pm Makefile.in Iter.pm dcopidlng kdocUtil.pm kdocAstUtil.pm Makefile.am run_test.sh
+-mocs: testdcop.moc
++mocs: dcopclient.moc
+ #>+ 3
+-dcopclient.moc: $(srcdir)/dcopclient.h
+- $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
++testdcop.moc: $(srcdir)/testdcop.h
++ $(MOC) $(srcdir)/testdcop.h -o testdcop.moc
+
#>+ 2
- docs-am:
---- dcop/tests/Makefile.in
-+++ dcop/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+-mocs: dcopclient.moc
++mocs: testdcop.moc
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
+ #>+ 3
+ dcopserver.moc: $(srcdir)/dcopserver.h
+@@ -1372,7 +1376,7 @@
- @SET_MAKE@
-+SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -72,24 +74,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/driver.Po ./$(DEPDIR)/test.Po
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/test_skel.P $(DEPDIR)/test_stub.P $(DEPDIR)/dcop_test.all_cpp.P $(DEPDIR)/driver.all_cpp.P ./$(DEPDIR)/driver.Po ./$(DEPDIR)/test.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/test_skel.P $(DEPDIR)/test_stub.P ./$(DEPDIR)/driver.Po ./$(DEPDIR)/test.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ clean-metasources:
+- -rm -f testdcop.moc dcopclient.moc dcopserver.moc dcop_deadlock_test.moc
++ -rm -f dcopclient.moc testdcop.moc dcopserver.moc dcop_deadlock_test.moc
+
#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
- DIST_SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
- ETAGS = etags
-@@ -109,6 +115,8 @@
+ KDE_DIST=dcop-path.h.in dcopserver_shutdown_win.cpp configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h dcopserver_win.cpp Makefile.am libDCOP_weak.nmcheck
+@@ -1493,8 +1497,8 @@
+
+ #>+ 18
+ nmcheck: nmcheck_libDCOP.la
+-dcopclient.lo: dcopclient.moc
+ testdcop.o: testdcop.moc
++dcopclient.lo: dcopclient.moc
+ libkdeinit_dcopserver.la: $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkdeinit_dcopserver_la_LDFLAGS) $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_LIBADD) $(LIBS)
+
+--- dcop/tests/Makefile.in
++++ dcop/tests/Makefile.in
+@@ -109,6 +109,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -16252,7 +14140,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -150,8 +158,6 @@
+@@ -150,8 +152,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -16261,7 +14149,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -228,7 +234,6 @@
+@@ -228,7 +228,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -16269,7 +14157,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -265,6 +270,9 @@
+@@ -265,6 +264,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16279,7 +14167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -320,6 +328,7 @@
+@@ -320,6 +322,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -16287,16 +14175,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -329,8 +338,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -348,6 +355,7 @@
+@@ -348,6 +351,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -16304,7 +14183,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -524,7 +532,7 @@
+@@ -524,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16313,7 +14192,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +570,9 @@
+@@ -562,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16325,79 +14204,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -593,21 +601,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -721,7 +732,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- dnssd/Makefile.in
+++ dnssd/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkdnssd_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,48 +57,68 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(dnssdincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -67,13 +67,17 @@
am__DEPENDENCIES_1 =
libkdnssd_la_DEPENDENCIES = ../kdecore/libkdecore.la \
$(am__DEPENDENCIES_1)
@@ -16420,58 +14229,7 @@
@KDE_USE_FINAL_FALSE at libkdnssd_la_OBJECTS = $(libkdnssd_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libkdnssd_la_OBJECTS = $(libkdnssd_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-publicservice.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-query.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-responder.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo
-+#>+ 14
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/settings.P $(DEPDIR)/libkdnssd_la.all_cpp.P ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-publicservice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-query.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-responder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/settings.P ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-publicservice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-query.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-responder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdnssd_la_SOURCES)
- DIST_SOURCES = $(libkdnssd_la_SOURCES)
- dnssdincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -118,6 +140,8 @@
+@@ -118,6 +122,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -16480,7 +14238,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -159,8 +183,6 @@
+@@ -159,8 +165,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -16489,7 +14247,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -237,7 +259,6 @@
+@@ -237,7 +241,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -16497,7 +14255,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -274,6 +295,9 @@
+@@ -274,6 +277,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16507,7 +14265,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,6 +353,7 @@
+@@ -329,6 +335,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -16515,16 +14273,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,8 +363,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -357,6 +380,7 @@
+@@ -357,6 +364,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -16532,7 +14281,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -515,7 +539,7 @@
+@@ -515,7 +523,7 @@
xdg_menudir = @xdg_menudir@
# set the include path for X, qt and KDE
@@ -16541,7 +14290,7 @@
# these are the headers for your project
noinst_HEADERS = sdevent.h
-@@ -533,7 +557,8 @@
+@@ -533,7 +541,8 @@
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h
@@ -16551,7 +14300,7 @@
libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
#>- all: all-am
#>+ 1
-@@ -541,7 +566,7 @@
+@@ -541,7 +550,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16560,7 +14309,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,16 +604,16 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16572,26 +14321,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -596,8 +621,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -619,35 +644,311 @@
+@@ -619,13 +628,13 @@
distclean-compile:
-rm -f *.tab.c
@@ -16612,537 +14342,100 @@
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@@ -648,6 +657,90 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+libkdnssd_la-remoteservice.o: remoteservice.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='remoteservice.cpp' object='libkdnssd_la-remoteservice.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-remoteservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-remoteservice.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
-+
-+libkdnssd_la-remoteservice.obj: remoteservice.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='remoteservice.cpp' object='libkdnssd_la-remoteservice.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-remoteservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-remoteservice.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`
-+
+libkdnssd_la-remoteservice.lo: remoteservice.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='remoteservice.cpp' object='libkdnssd_la-remoteservice.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-remoteservice.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-remoteservice.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
+
-+libkdnssd_la-responder.o: responder.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='responder.cpp' object='libkdnssd_la-responder.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-responder.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-responder.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
-+
-+libkdnssd_la-responder.obj: responder.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='responder.cpp' object='libkdnssd_la-responder.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-responder.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-responder.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`
-+
+libkdnssd_la-responder.lo: responder.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='responder.cpp' object='libkdnssd_la-responder.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-responder.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-responder.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
+
-+libkdnssd_la-servicebase.o: servicebase.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebase.cpp' object='libkdnssd_la-servicebase.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebase.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebase.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
-+
-+libkdnssd_la-servicebase.obj: servicebase.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebase.cpp' object='libkdnssd_la-servicebase.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebase.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebase.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`
-+
+libkdnssd_la-servicebase.lo: servicebase.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebase.cpp' object='libkdnssd_la-servicebase.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebase.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebase.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
+
-+libkdnssd_la-publicservice.o: publicservice.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='publicservice.cpp' object='libkdnssd_la-publicservice.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-publicservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-publicservice.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
-+
-+libkdnssd_la-publicservice.obj: publicservice.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='publicservice.cpp' object='libkdnssd_la-publicservice.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-publicservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-publicservice.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`
-+
+libkdnssd_la-publicservice.lo: publicservice.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='publicservice.cpp' object='libkdnssd_la-publicservice.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-publicservice.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-publicservice.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
+
-+libkdnssd_la-query.o: query.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='query.cpp' object='libkdnssd_la-query.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-query.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-query.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
-+
-+libkdnssd_la-query.obj: query.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='query.cpp' object='libkdnssd_la-query.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-query.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-query.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`
-+
+libkdnssd_la-query.lo: query.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='query.cpp' object='libkdnssd_la-query.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-query.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-query.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
+
-+libkdnssd_la-domainbrowser.o: domainbrowser.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='domainbrowser.cpp' object='libkdnssd_la-domainbrowser.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-domainbrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-domainbrowser.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
-+
-+libkdnssd_la-domainbrowser.obj: domainbrowser.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='domainbrowser.cpp' object='libkdnssd_la-domainbrowser.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-domainbrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-domainbrowser.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`
-+
+libkdnssd_la-domainbrowser.lo: domainbrowser.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='domainbrowser.cpp' object='libkdnssd_la-domainbrowser.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-domainbrowser.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-domainbrowser.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
+
-+libkdnssd_la-servicebrowser.o: servicebrowser.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebrowser.cpp' object='libkdnssd_la-servicebrowser.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebrowser.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
-+
-+libkdnssd_la-servicebrowser.obj: servicebrowser.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`; \
-+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
-+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebrowser.cpp' object='libkdnssd_la-servicebrowser.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebrowser.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`
-+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`
-+
+libkdnssd_la-servicebrowser.lo: servicebrowser.cpp
-+#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
+#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
+#>+ 2
-+ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebrowser.cpp' object='libkdnssd_la-servicebrowser.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebrowser.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebrowser.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
+#>+ 1
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
+
mostlyclean-libtool:
-rm -f *.lo
-@@ -662,7 +963,7 @@
- test -z "$(dnssdincludedir)" || $(mkdir_p) "$(DESTDIR)$(dnssdincludedir)"
- @list='$(dnssdinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dnssdincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(dnssdincludedir)/$$f'"; \
- $(dnssdincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(dnssdincludedir)/$$f"; \
- done
-@@ -670,7 +971,7 @@
- uninstall-dnssdincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(dnssdinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(dnssdincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(dnssdincludedir)/$$f"; \
- done
-@@ -777,7 +1078,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -485,7 +487,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*) \
-@@ -523,9 +525,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- doc/common/Makefile.in
+++ doc/common/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -58,12 +58,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(commondir)"
- commonDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(common_DATA)
-@@ -82,6 +76,8 @@
+@@ -82,6 +82,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17151,7 +14444,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -123,8 +119,6 @@
+@@ -123,8 +125,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -17160,7 +14453,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -201,7 +195,6 @@
+@@ -201,7 +201,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -17168,7 +14461,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -238,6 +231,9 @@
+@@ -238,6 +237,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17178,7 +14471,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -293,6 +289,7 @@
+@@ -293,6 +295,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -17186,16 +14479,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -302,8 +299,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -321,6 +316,7 @@
+@@ -321,6 +324,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -17203,7 +14487,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -498,7 +494,7 @@
+@@ -498,7 +502,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17212,7 +14496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +532,9 @@
+@@ -536,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17224,34 +14508,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -555,7 +551,7 @@
- test -z "$(commondir)" || $(mkdir_p) "$(DESTDIR)$(commondir)"
- @list='$(common_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(commonDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(commondir)/$$f'"; \
- $(commonDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(commondir)/$$f"; \
- done
-@@ -563,7 +559,7 @@
- uninstall-commonDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(common_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(commondir)/$$f'"; \
- rm -f "$(DESTDIR)$(commondir)/$$f"; \
- done
-@@ -627,7 +623,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -697,7 +693,7 @@
+@@ -697,7 +701,7 @@
.NOEXPORT:
#>+ 2
@@ -17262,18 +14519,6 @@
docs-am:
--- doc/kdelibs/Makefile.in
+++ doc/kdelibs/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -17318,16 +14563,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -17335,7 +14571,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -472,7 +474,7 @@
+@@ -472,7 +476,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17344,7 +14580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +512,9 @@
+@@ -510,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17356,38 +14592,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -581,7 +583,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -651,7 +653,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=man-qtoptions.7.docbook man-dcop.1.docbook Makefile.in man-checkXML.1.docbook man-artsmessage.1.docbook Makefile.am man-kdeoptions.7.docbook
-+KDE_DIST=man-qtoptions.7.docbook man-dcop.1.docbook man-kbuildsycoca.8.docbook Makefile.in man-checkXML.1.docbook man-artsmessage.1.docbook Makefile.am man-kdeoptions.7.docbook
-
- #>+ 2
- docs-am:
--- doc/kspell/Makefile.in
+++ doc/kspell/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -17432,16 +14638,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -17449,7 +14646,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -471,7 +473,7 @@
+@@ -471,7 +475,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17458,7 +14655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +511,9 @@
+@@ -509,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17470,30 +14667,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,7 +586,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- interfaces/Makefile.in
-+++ interfaces/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,6 +85,8 @@
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17502,7 +14678,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -126,8 +128,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -17511,7 +14687,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -204,7 +204,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -17519,7 +14695,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -241,6 +240,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17529,7 +14705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +298,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -17537,16 +14713,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,8 +308,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -324,6 +325,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -17554,16 +14721,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -488,7 +490,7 @@
+@@ -485,7 +489,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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +528,9 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17575,116 +14742,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -548,13 +550,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -566,7 +562,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -574,13 +570,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -601,7 +591,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -701,17 +691,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -740,7 +728,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/khexedit/Makefile.in
+++ interfaces/khexedit/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -56,14 +56,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(khexeditincludedir)"
-+am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(khexeditincludedir)"
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(servicetype_DATA)
- khexeditincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -85,6 +78,8 @@
+@@ -85,6 +85,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17693,7 +14753,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -126,8 +121,6 @@
+@@ -126,8 +128,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -17702,7 +14762,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -204,7 +197,6 @@
+@@ -204,7 +204,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -17710,7 +14770,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -241,6 +233,9 @@
+@@ -241,6 +240,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17720,7 +14780,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +291,7 @@
+@@ -296,6 +298,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -17728,16 +14788,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,8 +301,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -324,6 +318,7 @@
+@@ -324,6 +327,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -17745,7 +14796,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -497,7 +492,7 @@
+@@ -497,7 +501,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17754,7 +14805,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +530,9 @@
+@@ -535,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17766,66 +14817,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -554,7 +549,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -562,7 +557,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -571,7 +566,7 @@
- test -z "$(khexeditincludedir)" || $(mkdir_p) "$(DESTDIR)$(khexeditincludedir)"
- @list='$(khexeditinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(khexeditincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(khexeditincludedir)/$$f'"; \
- $(khexeditincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(khexeditincludedir)/$$f"; \
- done
-@@ -579,7 +574,7 @@
- uninstall-khexeditincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(khexeditinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(khexeditincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(khexeditincludedir)/$$f"; \
- done
-@@ -685,7 +680,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- interfaces/kimproxy/Makefile.in
-+++ interfaces/kimproxy/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
+--- interfaces/kimproxy/interface/Makefile.in
++++ interfaces/kimproxy/interface/Makefile.in
+@@ -87,6 +87,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17834,7 +14828,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
+@@ -128,8 +130,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -17843,7 +14837,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
+@@ -206,7 +206,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -17851,7 +14845,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
+@@ -243,6 +242,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17861,7 +14855,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
+@@ -298,6 +300,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -17869,16 +14863,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -326,6 +329,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -17886,16 +14871,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +487,7 @@
- all: docs-am all-recursive
+@@ -495,7 +499,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)
+-$(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*) \
-@@ -523,9 +525,9 @@
+@@ -533,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17907,117 +14892,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- interfaces/kimproxy/interface/Makefile.in
-+++ interfaces/kimproxy/interface/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -56,15 +56,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kcm_instantmessengerdir)" \
-- "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(kimifaceincludedir)"
-+am__installdirs = "$(DESTDIR)$(kcm_instantmessengerdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kimifaceincludedir)"
- kcm_instantmessengerDATA_INSTALL = $(INSTALL_DATA)
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kcm_instantmessenger_DATA) $(servicetype_DATA)
-@@ -87,6 +79,8 @@
+--- interfaces/kimproxy/library/icons/Makefile.in
++++ interfaces/kimproxy/library/icons/Makefile.in
+@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18026,7 +14903,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -128,8 +122,6 @@
+@@ -109,8 +111,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -18035,7 +14912,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -206,7 +198,6 @@
+@@ -187,7 +187,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -18043,7 +14920,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -243,6 +234,9 @@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18053,7 +14930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -298,6 +292,7 @@
+@@ -279,6 +281,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -18061,16 +14938,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -307,8 +302,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -326,6 +319,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -18078,16 +14946,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -495,7 +489,7 @@
+@@ -469,7 +473,7 @@
all: docs-am all-am
.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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -533,9 +527,9 @@
+@@ -507,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18099,144 +14967,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -552,7 +546,7 @@
- test -z "$(kcm_instantmessengerdir)" || $(mkdir_p) "$(DESTDIR)$(kcm_instantmessengerdir)"
- @list='$(kcm_instantmessenger_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kcm_instantmessengerDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kcm_instantmessengerdir)/$$f'"; \
- $(kcm_instantmessengerDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kcm_instantmessengerdir)/$$f"; \
- done
-@@ -560,7 +554,7 @@
- uninstall-kcm_instantmessengerDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kcm_instantmessenger_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kcm_instantmessengerdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kcm_instantmessengerdir)/$$f"; \
- done
-@@ -569,7 +563,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -577,7 +571,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -586,7 +580,7 @@
- test -z "$(kimifaceincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimifaceincludedir)"
- @list='$(kimifaceinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kimifaceincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kimifaceincludedir)/$$f'"; \
- $(kimifaceincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kimifaceincludedir)/$$f"; \
- done
-@@ -594,7 +588,7 @@
- uninstall-kimifaceincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kimifaceinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kimifaceincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kimifaceincludedir)/$$f"; \
- done
-@@ -701,7 +695,7 @@
- clean-generic:
+@@ -659,33 +663,33 @@
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ #>+ 29
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
+
+ #>+ 15
+ force-reedit:
--- interfaces/kimproxy/library/Makefile.in
+++ interfaces/kimproxy/library/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkimproxy_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kimproxyincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kimproxyincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -77,24 +72,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kimproxy.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kimiface_stub.P $(DEPDIR)/kimproxyiface_skel.P $(DEPDIR)/libkimproxy_la.all_cpp.P ./$(DEPDIR)/kimproxy.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kimiface_stub.P $(DEPDIR)/kimproxyiface_skel.P ./$(DEPDIR)/kimproxy.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkimproxy_la_SOURCES)
- DIST_SOURCES = $(libkimproxy_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -130,6 +129,8 @@
+@@ -130,6 +130,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18245,7 +15025,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -171,8 +172,6 @@
+@@ -171,8 +173,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -18254,7 +15034,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -249,7 +248,6 @@
+@@ -249,7 +249,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -18262,7 +15042,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -286,6 +284,9 @@
+@@ -286,6 +285,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18272,7 +15052,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,6 +342,7 @@
+@@ -341,6 +343,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -18280,16 +15060,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -369,6 +369,7 @@
+@@ -369,6 +372,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -18297,7 +15068,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -548,7 +549,7 @@
+@@ -548,7 +552,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18306,7 +15077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,16 +587,16 @@
+@@ -586,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18318,165 +15089,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -603,8 +604,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -635,21 +636,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -666,7 +670,7 @@
- test -z "$(kimproxyincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimproxyincludedir)"
- @list='$(kimproxyinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kimproxyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kimproxyincludedir)/$$f'"; \
- $(kimproxyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kimproxyincludedir)/$$f"; \
- done
-@@ -674,7 +678,7 @@
- uninstall-kimproxyincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kimproxyinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kimproxyincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kimproxyincludedir)/$$f"; \
- done
-@@ -686,13 +690,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -704,7 +702,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -712,13 +710,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -739,7 +731,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -839,17 +831,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -881,7 +871,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- interfaces/kimproxy/library/icons/Makefile.in
-+++ interfaces/kimproxy/library/icons/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,6 +68,8 @@
+--- interfaces/kimproxy/Makefile.in
++++ interfaces/kimproxy/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18485,7 +15100,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -109,8 +111,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -18494,7 +15109,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -187,7 +187,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -18502,7 +15117,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -224,6 +223,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18512,7 +15127,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -279,6 +281,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -18520,16 +15135,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -18537,8 +15143,8 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -469,7 +471,7 @@
- all: docs-am all-am
+@@ -485,7 +489,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -18546,7 +15152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +509,9 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18558,90 +15164,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -578,7 +580,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -659,33 +661,33 @@
-
- #>+ 29
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-presence_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-presence_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-presence_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_online.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_away.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_away.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_offline.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_offline.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_online.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/presence_away.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
-
- #>+ 15
- force-reedit:
--- interfaces/kio/Makefile.in
+++ interfaces/kio/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -55,12 +55,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kioincludedir)"
- kioincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(kioinclude_HEADERS)
-@@ -81,6 +75,8 @@
+@@ -81,6 +81,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18650,7 +15175,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -122,8 +118,6 @@
+@@ -122,8 +124,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -18659,7 +15184,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -200,7 +194,6 @@
+@@ -200,7 +200,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -18667,7 +15192,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -237,6 +230,9 @@
+@@ -237,6 +236,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18677,7 +15202,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,6 +288,7 @@
+@@ -292,6 +294,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -18685,16 +15210,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -301,8 +298,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -320,6 +315,7 @@
+@@ -320,6 +323,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -18702,7 +15218,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -483,7 +479,7 @@
+@@ -483,7 +487,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18711,7 +15227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +517,9 @@
+@@ -521,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18723,109 +15239,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -540,7 +536,7 @@
- test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
- @list='$(kioinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kioincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kioincludedir)/$$f'"; \
- $(kioincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kioincludedir)/$$f"; \
- done
-@@ -548,7 +544,7 @@
- uninstall-kioincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kioinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kioincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kioincludedir)/$$f"; \
- done
-@@ -654,7 +650,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- interfaces/kmediaplayer/Makefile.in
-+++ interfaces/kmediaplayer/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libkmediaplayer_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,15 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kde_servicetypesdir)" \
-- "$(DESTDIR)$(kmediaplayerincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kmediaplayerincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -78,24 +72,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/player.Plo ./$(DEPDIR)/view.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/playerdcopobject_skel.P $(DEPDIR)/libkmediaplayer_la.all_cpp.P ./$(DEPDIR)/player.Plo ./$(DEPDIR)/view.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/playerdcopobject_skel.P ./$(DEPDIR)/player.Plo ./$(DEPDIR)/view.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmediaplayer_la_SOURCES)
- DIST_SOURCES = $(libkmediaplayer_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -133,6 +131,8 @@
+--- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
++++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+@@ -112,6 +112,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18834,7 +15250,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -174,8 +174,6 @@
+@@ -153,8 +155,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -18843,7 +15259,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -252,7 +250,6 @@
+@@ -231,7 +231,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -18851,7 +15267,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -289,6 +286,9 @@
+@@ -268,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18861,7 +15277,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -344,6 +344,7 @@
+@@ -323,6 +325,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -18869,16 +15285,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -353,8 +354,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -372,6 +371,7 @@
+@@ -351,6 +354,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -18886,7 +15293,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -549,7 +549,7 @@
+@@ -522,7 +526,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18895,7 +15302,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,16 +587,16 @@
+@@ -560,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18905,237 +15312,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -604,8 +604,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -637,21 +637,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -668,7 +671,7 @@
- test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -676,7 +679,7 @@
- uninstall-kde_servicetypesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -685,7 +688,7 @@
- test -z "$(kmediaplayerincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmediaplayerincludedir)"
- @list='$(kmediaplayerinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kmediaplayerincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kmediaplayerincludedir)/$$f'"; \
- $(kmediaplayerincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kmediaplayerincludedir)/$$f"; \
- done
-@@ -693,7 +696,7 @@
- uninstall-kmediaplayerincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kmediaplayerinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kmediaplayerincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kmediaplayerincludedir)/$$f"; \
- done
-@@ -705,13 +708,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -723,7 +720,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -731,13 +728,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -758,7 +749,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -860,14 +851,12 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -899,7 +888,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
-+++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kfileaudiopreview_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -74,24 +70,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kfileaudiopreview.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kfileaudiopreview.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfileaudiopreview_la_SOURCES)
- DIST_SOURCES = $(kfileaudiopreview_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -112,6 +111,8 @@
+--- interfaces/kmediaplayer/Makefile.in
++++ interfaces/kmediaplayer/Makefile.in
+@@ -133,6 +133,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19144,7 +15325,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +154,6 @@
+@@ -174,8 +176,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -19153,7 +15334,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +230,6 @@
+@@ -252,7 +252,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -19161,7 +15342,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +266,9 @@
+@@ -289,6 +288,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19171,7 +15352,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +324,7 @@
+@@ -344,6 +346,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -19179,16 +15360,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +351,7 @@
+@@ -372,6 +375,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -19196,7 +15368,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -522,7 +523,7 @@
+@@ -549,7 +553,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19205,7 +15377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,16 +561,16 @@
+@@ -587,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19215,95 +15387,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -577,8 +578,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -609,21 +610,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -737,7 +741,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/kregexpeditor/Makefile.in
+++ interfaces/kregexpeditor/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -58,14 +58,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(servicetype_DATA)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -87,6 +80,8 @@
+@@ -87,6 +87,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19312,7 +15400,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -128,8 +123,6 @@
+@@ -128,8 +130,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -19321,7 +15409,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -206,7 +199,6 @@
+@@ -206,7 +206,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -19329,7 +15417,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -243,6 +235,9 @@
+@@ -243,6 +242,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19339,7 +15427,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -298,6 +293,7 @@
+@@ -298,6 +300,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -19347,16 +15435,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -307,8 +303,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -326,6 +320,7 @@
+@@ -326,6 +329,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -19364,7 +15443,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -492,7 +487,7 @@
+@@ -492,7 +496,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19373,7 +15452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -530,9 +525,9 @@
+@@ -530,9 +534,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19385,126 +15464,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -549,7 +544,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -557,7 +552,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -566,7 +561,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -574,7 +569,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -680,7 +675,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/kscript/Makefile.in
+++ interfaces/kscript/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libkscript_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(kscriptincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kscriptincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -78,24 +73,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/scriptmanager.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/scriptclientinterface.moc.P $(DEPDIR)/libkscript_la.all_cpp.P ./$(DEPDIR)/scriptmanager.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/scriptclientinterface.moc.P ./$(DEPDIR)/scriptmanager.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkscript_la_SOURCES)
- DIST_SOURCES = $(libkscript_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -133,6 +132,8 @@
+@@ -133,6 +133,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19513,7 +15475,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -174,8 +175,6 @@
+@@ -174,8 +176,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -19522,7 +15484,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -252,7 +251,6 @@
+@@ -252,7 +252,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -19530,7 +15492,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -289,6 +287,9 @@
+@@ -289,6 +288,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19540,7 +15502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -344,6 +345,7 @@
+@@ -344,6 +346,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -19548,16 +15510,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -353,8 +355,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -372,6 +372,7 @@
+@@ -372,6 +375,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -19565,7 +15518,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -552,7 +553,7 @@
+@@ -552,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19574,7 +15527,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,16 +591,16 @@
+@@ -590,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19586,242 +15539,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -607,8 +608,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -639,21 +640,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -670,7 +674,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -678,7 +682,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -687,7 +691,7 @@
- test -z "$(kscriptincludedir)" || $(mkdir_p) "$(DESTDIR)$(kscriptincludedir)"
- @list='$(kscriptinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kscriptincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kscriptincludedir)/$$f'"; \
- $(kscriptincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kscriptincludedir)/$$f"; \
- done
-@@ -695,7 +699,7 @@
- uninstall-kscriptincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kscriptinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kscriptincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kscriptincludedir)/$$f"; \
- done
-@@ -707,13 +711,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -725,7 +723,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -733,13 +731,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -760,7 +752,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -859,17 +851,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -901,7 +891,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/kscript/sample/Makefile.in
+++ interfaces/kscript/sample/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libshellscript_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicetypedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicetypedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- libshellscript_la_DEPENDENCIES = ../libkscript.la
-@@ -71,24 +66,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/shellscript.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shellscript.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libshellscript_la_SOURCES)
- DIST_SOURCES = $(libshellscript_la_SOURCES)
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
-@@ -110,6 +108,8 @@
+@@ -110,6 +110,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19830,7 +15550,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -151,8 +151,6 @@
+@@ -151,8 +153,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -19839,7 +15559,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -229,7 +227,6 @@
+@@ -229,7 +229,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -19847,7 +15567,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -266,6 +263,9 @@
+@@ -266,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19857,7 +15577,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -321,6 +321,7 @@
+@@ -321,6 +323,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -19865,16 +15585,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -330,8 +331,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -349,6 +348,7 @@
+@@ -349,6 +352,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -19882,7 +15593,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -521,7 +521,7 @@
+@@ -521,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19891,7 +15602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,16 +559,16 @@
+@@ -559,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19903,111 +15614,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -576,8 +576,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -608,21 +608,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -639,7 +642,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -647,7 +650,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -753,7 +756,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/kspeech/Makefile.in
+++ interfaces/kspeech/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -56,14 +56,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_servicetypesdir)" \
-- "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
- kde_servicetypesDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kde_servicetypes_DATA)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -85,6 +78,8 @@
+@@ -85,6 +85,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20016,7 +15625,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -126,8 +121,6 @@
+@@ -126,8 +128,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -20025,7 +15634,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -204,7 +197,6 @@
+@@ -204,7 +204,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -20033,7 +15642,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -241,6 +233,9 @@
+@@ -241,6 +240,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20043,7 +15652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +291,7 @@
+@@ -296,6 +298,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -20051,16 +15660,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,8 +301,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -324,6 +318,7 @@
+@@ -324,6 +327,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -20068,7 +15668,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -493,7 +488,7 @@
+@@ -493,7 +497,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20077,7 +15677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +526,9 @@
+@@ -531,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20089,245 +15689,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -550,7 +545,7 @@
- test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -558,7 +553,7 @@
- uninstall-kde_servicetypesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -567,7 +562,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -575,7 +570,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -682,7 +677,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/ktexteditor/Makefile.in
+++ interfaces/ktexteditor/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libktexteditor_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,16 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kcm_ktexteditordir)" \
-- "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(ktexteditorincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kcm_ktexteditordir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(ktexteditorincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -116,24 +109,145 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/blockselectiondcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/blockselectioninterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/clipboarddcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/clipboardinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/codecompletioninterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/configinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/configinterfaceextension.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cursorinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentdcopinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dynwordwrapinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/editdcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/editinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/editinterfaceext.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/editorchooser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/encodingdcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/encodinginterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/highlightinginterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktexteditor.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/markinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/markinterfaceextension.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/popupmenuinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/printdcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/printinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/searchdcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/searchinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectiondcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterfaceext.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sessionconfiginterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/templateinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/texthintinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/undodcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/undointerface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/variableinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewcursordcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewcursorinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsgdcopinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsginterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/wordwrapinterface.Plo
-+#>+ 80
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/editdcopinterface_skel.P $(DEPDIR)/clipboarddcopinterface_skel.P $(DEPDIR)/selectiondcopinterface_skel.P $(DEPDIR)/searchdcopinterface_skel.P $(DEPDIR)/blockselectiondcopinterface_skel.P $(DEPDIR)/documentdcopinfo_skel.P $(DEPDIR)/encodingdcopinterface_skel.P $(DEPDIR)/printdcopinterface_skel.P $(DEPDIR)/undodcopinterface_skel.P $(DEPDIR)/viewcursordcopinterface_skel.P $(DEPDIR)/viewstatusmsgdcopinterface_skel.P $(DEPDIR)/selectionextdcopinterface_skel.P $(DEPDIR)/editorchooser_ui.P $(DEPDIR)/libktexteditor_la.all_cpp.P ./$(DEPDIR)/blockselectiondcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/blockselectioninterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboarddcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboardinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/codecompletioninterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterfaceextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cursorinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentdcopinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dynwordwrapinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterfaceext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editorchooser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodingdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodinginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/highlightinginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktexteditor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterfaceextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/popupmenuinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectiondcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterfaceext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessionconfiginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/templateinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/texthintinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/undodcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/undointerface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/variableinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursordcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursorinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsgdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/wordwrapinterface.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/editdcopinterface_skel.P $(DEPDIR)/clipboarddcopinterface_skel.P $(DEPDIR)/selectiondcopinterface_skel.P $(DEPDIR)/searchdcopinterface_skel.P $(DEPDIR)/blockselectiondcopinterface_skel.P $(DEPDIR)/documentdcopinfo_skel.P $(DEPDIR)/encodingdcopinterface_skel.P $(DEPDIR)/printdcopinterface_skel.P $(DEPDIR)/undodcopinterface_skel.P $(DEPDIR)/viewcursordcopinterface_skel.P $(DEPDIR)/viewstatusmsgdcopinterface_skel.P $(DEPDIR)/selectionextdcopinterface_skel.P $(DEPDIR)/editorchooser_ui.P ./$(DEPDIR)/blockselectiondcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/blockselectioninterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboarddcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboardinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/codecompletioninterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterfaceextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cursorinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentdcopinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dynwordwrapinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterfaceext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editorchooser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodingdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodinginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/highlightinginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktexteditor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterfaceextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/popupmenuinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectiondcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterfaceext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessionconfiginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/templateinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/texthintinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/undodcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/undointerface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/variableinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursordcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursorinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsgdcopinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsginterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/wordwrapinterface.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libktexteditor_la_SOURCES)
- DIST_SOURCES = $(libktexteditor_la_SOURCES)
- kcm_ktexteditorDATA_INSTALL = $(INSTALL_DATA)
-@@ -158,6 +272,8 @@
+@@ -158,6 +158,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20336,7 +15700,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -199,8 +315,6 @@
+@@ -199,8 +201,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -20345,7 +15709,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -277,7 +391,6 @@
+@@ -277,7 +277,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -20353,7 +15717,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -314,6 +427,9 @@
+@@ -314,6 +313,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20363,7 +15727,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -369,6 +485,7 @@
+@@ -369,6 +371,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -20371,16 +15735,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,8 +495,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -397,6 +512,7 @@
+@@ -397,6 +400,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -20388,7 +15743,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -618,7 +734,7 @@
+@@ -618,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20397,7 +15752,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,16 +772,16 @@
+@@ -656,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20409,117 +15764,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -673,8 +789,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -741,21 +857,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -772,7 +891,7 @@
- test -z "$(kcm_ktexteditordir)" || $(mkdir_p) "$(DESTDIR)$(kcm_ktexteditordir)"
- @list='$(kcm_ktexteditor_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kcm_ktexteditorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kcm_ktexteditordir)/$$f'"; \
- $(kcm_ktexteditorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kcm_ktexteditordir)/$$f"; \
- done
-@@ -780,7 +899,7 @@
- uninstall-kcm_ktexteditorDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kcm_ktexteditor_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kcm_ktexteditordir)/$$f'"; \
- rm -f "$(DESTDIR)$(kcm_ktexteditordir)/$$f"; \
- done
-@@ -789,7 +908,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -797,7 +916,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -806,7 +925,7 @@
- test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
- @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(ktexteditorincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
- $(ktexteditorincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
- done
-@@ -814,7 +933,7 @@
- uninstall-ktexteditorincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
- done
-@@ -921,7 +1040,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1179,22 +1298,22 @@
+@@ -1179,22 +1183,22 @@
mocs: view.moc
#>+ 3
@@ -20549,7 +15794,7 @@
#>+ 2
KDE_DIST=ktexteditorplugin.desktop undodcopinterface.h viewstatusmsgdcopinterface.h ktexteditoreditor.desktop viewcursordcopinterface.h searchdcopinterface.h documentdcopinfo.h kcm_ktexteditor.desktop ktexteditor.desktop editorchooser_ui.ui editdcopinterface.h clipboarddcopinterface.h Makefile.in blockselectiondcopinterface.h encodingdcopinterface.h printdcopinterface.h selectiondcopinterface.h Makefile.am
-@@ -1262,7 +1381,7 @@
+@@ -1262,7 +1266,7 @@
#>+ 11
@@ -20558,34 +15803,84 @@
@echo 'creating libktexteditor_la.all_cpp.cpp ...'; \
rm -f libktexteditor_la.all_cpp.files libktexteditor_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libktexteditor_la.all_cpp.final; \
+--- interfaces/Makefile.in
++++ interfaces/Makefile.in
+@@ -85,6 +85,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +128,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +204,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +240,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -296,6 +298,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -324,6 +327,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -488,7 +492,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*) \
+@@ -526,9 +530,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- interfaces/terminal/Makefile.in
+++ interfaces/terminal/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -55,12 +55,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(ktexteditorincludedir)"
- ktexteditorincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(ktexteditorinclude_HEADERS)
-@@ -81,6 +75,8 @@
+@@ -81,6 +81,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20594,7 +15889,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -122,8 +118,6 @@
+@@ -122,8 +124,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -20603,7 +15898,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -200,7 +194,6 @@
+@@ -200,7 +200,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -20611,7 +15906,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -237,6 +230,9 @@
+@@ -237,6 +236,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20621,7 +15916,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,6 +288,7 @@
+@@ -292,6 +294,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -20629,16 +15924,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -301,8 +298,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -320,6 +315,7 @@
+@@ -320,6 +323,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -20646,7 +15932,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -483,7 +479,7 @@
+@@ -483,7 +487,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20655,7 +15941,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +517,9 @@
+@@ -521,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20667,91 +15953,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -540,7 +536,7 @@
- test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
- @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(ktexteditorincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
- $(ktexteditorincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
- done
-@@ -548,7 +544,7 @@
- uninstall-ktexteditorincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
- done
-@@ -654,7 +650,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- interfaces/terminal/test/Makefile.in
+++ interfaces/terminal/test/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(test_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -62,24 +64,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(test_SOURCES)
- DIST_SOURCES = $(test_SOURCES)
- ETAGS = etags
-@@ -99,6 +104,8 @@
+@@ -99,6 +99,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20760,7 +15964,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -140,8 +147,6 @@
+@@ -140,8 +142,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -20769,7 +15973,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -218,7 +223,6 @@
+@@ -218,7 +218,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -20777,7 +15981,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -255,6 +259,9 @@
+@@ -255,6 +254,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20787,7 +15991,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -310,6 +317,7 @@
+@@ -310,6 +312,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -20795,16 +15999,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -319,8 +327,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -338,6 +344,7 @@
+@@ -338,6 +341,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -20812,7 +16007,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -505,7 +512,7 @@
+@@ -505,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20821,7 +16016,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +550,9 @@
+@@ -543,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20833,105 +16028,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -570,21 +577,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -696,7 +706,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kab/Makefile.in
+++ kab/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(libkab_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -65,24 +67,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/addressbook.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kabapi.Plo ./$(DEPDIR)/qconfigDB.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkab_la.all_cc.P ./$(DEPDIR)/addressbook.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kabapi.Plo ./$(DEPDIR)/qconfigDB.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/addressbook.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kabapi.Plo ./$(DEPDIR)/qconfigDB.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkab_la_SOURCES)
- DIST_SOURCES = $(libkab_la_SOURCES)
- ETAGS = etags
-@@ -102,6 +111,8 @@
+@@ -102,6 +102,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20940,7 +16039,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -143,8 +154,6 @@
+@@ -143,8 +145,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -20949,7 +16048,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -221,7 +230,6 @@
+@@ -221,7 +221,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -20957,7 +16056,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -258,6 +266,9 @@
+@@ -258,6 +257,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20967,7 +16066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,6 +324,7 @@
+@@ -313,6 +315,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -20975,16 +16074,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -322,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -341,6 +351,7 @@
+@@ -341,6 +344,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -20992,7 +16082,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -517,7 +528,7 @@
+@@ -517,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21001,7 +16091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +566,9 @@
+@@ -555,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21013,46 +16103,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -588,21 +599,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+@@ -800,18 +804,18 @@
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -713,7 +727,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -800,18 +814,18 @@
-
-
#>+ 3
-kabapi.moc: $(srcdir)/kabapi.h
- $(MOC) $(srcdir)/kabapi.h -o kabapi.moc
@@ -21075,7 +16128,7 @@
#>+ 3
addressbook.moc: $(srcdir)/addressbook.h
-@@ -822,7 +836,7 @@
+@@ -822,7 +826,7 @@
#>+ 3
clean-metasources:
@@ -21084,7 +16137,7 @@
#>+ 2
KDE_DIST=README.KABAPI template.kab template.config addressbook.h README.FORMAT kabapi.h Makefile.in qconfigDB.h Makefile.am
-@@ -873,7 +887,7 @@
+@@ -873,7 +877,7 @@
#>+ 11
@@ -21093,178 +16146,84 @@
@echo 'creating libkab_la.all_cc.cc ...'; \
rm -f libkab_la.all_cc.files libkab_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkab_la.all_cc.final; \
---- kabc/Makefile.in
-+++ kabc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+--- kabc/formats/Makefile.in
++++ kabc/formats/Makefile.in
+@@ -112,6 +112,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +155,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +267,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -323,6 +325,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,6 +354,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -533,7 +537,7 @@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
+ .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*) \
+@@ -571,9 +575,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-
-+SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -58,15 +60,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(managerdir)" \
-- "$(DESTDIR)$(mapdir)" "$(DESTDIR)$(kabcincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(managerdir)" "$(DESTDIR)$(mapdir)" "$(DESTDIR)$(kabcincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -110,24 +104,124 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/address.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/addressee.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresseedialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresseehelper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresseelist.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresslineedit.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/agent.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/distributionlist.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/distributionlistdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/distributionlisteditor.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/errorhandler.Plo ./$(DEPDIR)/field.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/formatfactory.Plo ./$(DEPDIR)/geo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kab2kabc.Po ./$(DEPDIR)/key.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldapclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldapconfigwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldapurl.Plo ./$(DEPDIR)/ldif.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldifconverter.Plo ./$(DEPDIR)/lock.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/locknull.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/phonenumber.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/picture.Plo ./$(DEPDIR)/plugin.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceselectdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/secrecy.Plo ./$(DEPDIR)/sortmode.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sound.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/stdaddressbook.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/timezone.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcard21parser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardconverter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardformat.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatplugin.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardtool.Plo
-+#>+ 66
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/addresseehelper_skel.P $(DEPDIR)/libkabc_la.all_cpp.P ./$(DEPDIR)/address.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressee.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseedialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseehelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseelist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresslineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/agent.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlistdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlisteditor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/errorhandler.Plo ./$(DEPDIR)/field.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/formatfactory.Plo ./$(DEPDIR)/geo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kab2kabc.Po ./$(DEPDIR)/key.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapconfigwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapurl.Plo ./$(DEPDIR)/ldif.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldifconverter.Plo ./$(DEPDIR)/lock.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/locknull.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/phonenumber.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/picture.Plo ./$(DEPDIR)/plugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceselectdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/secrecy.Plo ./$(DEPDIR)/sortmode.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sound.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/stdaddressbook.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/timezone.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcard21parser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardconverter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformat.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatplugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardtool.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/addresseehelper_skel.P ./$(DEPDIR)/address.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressee.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseedialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseehelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseelist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresslineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/agent.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlistdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlisteditor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/errorhandler.Plo ./$(DEPDIR)/field.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/formatfactory.Plo ./$(DEPDIR)/geo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kab2kabc.Po ./$(DEPDIR)/key.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapconfigwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapurl.Plo ./$(DEPDIR)/ldif.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldifconverter.Plo ./$(DEPDIR)/lock.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/locknull.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/phonenumber.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/picture.Plo ./$(DEPDIR)/plugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceselectdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/secrecy.Plo ./$(DEPDIR)/sortmode.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sound.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/stdaddressbook.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/timezone.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcard21parser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardconverter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformat.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatplugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardtool.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
- DIST_SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -167,6 +261,8 @@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
+--- kabc/Makefile.in
++++ kabc/Makefile.in
+@@ -167,6 +167,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -21273,7 +16232,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -208,8 +304,6 @@
+@@ -208,8 +210,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -21282,7 +16241,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -286,7 +380,6 @@
+@@ -286,7 +286,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -21290,7 +16249,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -323,6 +416,9 @@
+@@ -323,6 +322,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21300,7 +16259,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -378,6 +474,7 @@
+@@ -378,6 +380,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -21308,16 +16267,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,8 +484,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -406,6 +501,7 @@
+@@ -406,6 +409,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -21325,7 +16275,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -631,7 +727,7 @@
+@@ -631,7 +635,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21334,7 +16284,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,16 +765,16 @@
+@@ -669,9 +673,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21346,205 +16296,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -686,8 +782,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -788,21 +884,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -819,7 +918,7 @@
- test -z "$(autostartdir)" || $(mkdir_p) "$(DESTDIR)$(autostartdir)"
- @list='$(autostart_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(autostartDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autostartdir)/$$f'"; \
- $(autostartDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autostartdir)/$$f"; \
- done
-@@ -827,7 +926,7 @@
- uninstall-autostartDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(autostart_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(autostartdir)/$$f'"; \
- rm -f "$(DESTDIR)$(autostartdir)/$$f"; \
- done
-@@ -836,7 +935,7 @@
- test -z "$(managerdir)" || $(mkdir_p) "$(DESTDIR)$(managerdir)"
- @list='$(manager_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(managerDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(managerdir)/$$f'"; \
- $(managerDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(managerdir)/$$f"; \
- done
-@@ -844,7 +943,7 @@
- uninstall-managerDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(manager_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(managerdir)/$$f'"; \
- rm -f "$(DESTDIR)$(managerdir)/$$f"; \
- done
-@@ -853,7 +952,7 @@
- test -z "$(mapdir)" || $(mkdir_p) "$(DESTDIR)$(mapdir)"
- @list='$(map_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mapdir)/$$f'"; \
- $(mapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mapdir)/$$f"; \
- done
-@@ -861,7 +960,7 @@
- uninstall-mapDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(map_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mapdir)/$$f'"; \
- rm -f "$(DESTDIR)$(mapdir)/$$f"; \
- done
-@@ -870,7 +969,7 @@
- test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -878,7 +977,7 @@
- uninstall-kabcincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -890,13 +989,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -908,7 +1001,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -916,13 +1009,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -943,7 +1030,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1043,17 +1130,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1088,7 +1173,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1319,18 +1404,18 @@
+@@ -1319,18 +1323,18 @@
mocs: resourceselectdialog.moc
#>+ 3
@@ -21569,7 +16321,7 @@
#>+ 3
distributionlisteditor.moc: $(srcdir)/distributionlisteditor.h
-@@ -1347,18 +1432,18 @@
+@@ -1347,18 +1351,18 @@
mocs: addresslineedit.moc
#>+ 3
@@ -21594,7 +16346,7 @@
#>+ 3
distributionlistdialog.moc: $(srcdir)/distributionlistdialog.h
-@@ -1383,7 +1468,7 @@
+@@ -1383,7 +1387,7 @@
#>+ 3
clean-metasources:
@@ -21603,7 +16355,7 @@
#>+ 2
KDE_DIST=vcard21parser.h HACKING kabc_manager.desktop README.AddressFormat HOWTO vcardtool.h addresseehelper.h countrytransl.map Makefile.in vcardformatimpl.h kab2kabc.desktop Makefile.am
-@@ -1439,7 +1524,7 @@
+@@ -1439,7 +1443,7 @@
#>+ 11
@@ -21612,77 +16364,9 @@
@echo 'creating libkabc_la.all_cpp.cpp ...'; \
rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
---- kabc/formats/Makefile.in
-+++ kabc/formats/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabcformat_binary_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,12 +57,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -72,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/binaryformat.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/binaryformat.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabcformat_binary_la_SOURCES)
- DIST_SOURCES = $(kabcformat_binary_la_SOURCES)
- linkDATA_INSTALL = $(INSTALL_DATA)
-@@ -112,6 +111,8 @@
+--- kabc/plugins/dir/Makefile.in
++++ kabc/plugins/dir/Makefile.in
+@@ -124,6 +124,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -21691,7 +16375,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +154,6 @@
+@@ -165,8 +167,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -21700,7 +16384,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +230,6 @@
+@@ -243,7 +243,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -21708,7 +16392,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +266,9 @@
+@@ -280,6 +279,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21718,7 +16402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +324,7 @@
+@@ -335,6 +337,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -21726,16 +16410,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +351,7 @@
+@@ -363,6 +366,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -21743,7 +16418,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -533,7 +534,7 @@
+@@ -547,7 +551,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21752,7 +16427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,16 +572,16 @@
+@@ -585,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21764,95 +16439,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -588,8 +589,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -620,21 +621,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -651,7 +655,7 @@
- test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
- @list='$(link_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(linkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(linkdir)/$$f'"; \
- $(linkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(linkdir)/$$f"; \
- done
-@@ -659,7 +663,7 @@
- uninstall-linkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(link_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(linkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(linkdir)/$$f"; \
- done
-@@ -765,7 +769,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kabc/plugins/Makefile.in
-+++ kabc/plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
+--- kabc/plugins/evolution/Makefile.in
++++ kabc/plugins/evolution/Makefile.in
+@@ -118,6 +118,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -21861,7 +16450,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
+@@ -159,8 +161,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -21870,7 +16459,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
+@@ -237,7 +237,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -21878,7 +16467,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
+@@ -274,6 +273,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21888,7 +16477,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
+@@ -329,6 +331,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -21896,16 +16485,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -357,6 +360,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -21913,257 +16493,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +487,7 @@
- all: docs-am all-recursive
+@@ -530,7 +534,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -523,9 +525,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kabc/plugins/dir/Makefile.in
-+++ kabc/plugins/dir/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -83,24 +78,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcedir.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirplugin.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_dir_la.all_cpp.P ./$(DEPDIR)/resourcedir.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirplugin.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcedir.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirplugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
- DIST_SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -124,6 +129,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -165,8 +172,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -243,7 +248,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -280,6 +284,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -335,6 +342,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -363,6 +369,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -547,7 +554,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*) \
-@@ -585,16 +592,16 @@
+@@ -568,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22175,196 +16514,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -602,8 +609,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -621,7 +628,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -629,8 +636,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -668,21 +675,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -699,7 +709,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -707,7 +717,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -716,7 +726,7 @@
- test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -724,7 +734,7 @@
- uninstall-kabcincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -830,7 +840,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kabc/plugins/evolution/Makefile.in
-+++ kabc/plugins/evolution/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabc_evo_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kabc_evo_la_DEPENDENCIES = ../../../kabc/libkabc.la \
-@@ -78,24 +73,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dbwrapper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceevo.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kabc_evo_la.all_cpp.P ./$(DEPDIR)/dbwrapper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceevo.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dbwrapper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceevo.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabc_evo_la_SOURCES)
- DIST_SOURCES = $(kabc_evo_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -118,6 +120,8 @@
+--- kabc/plugins/file/Makefile.in
++++ kabc/plugins/file/Makefile.in
+@@ -124,6 +124,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -22373,7 +16525,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -159,8 +163,6 @@
+@@ -165,8 +167,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -22382,7 +16534,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -237,7 +239,6 @@
+@@ -243,7 +243,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -22390,7 +16542,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -274,6 +275,9 @@
+@@ -280,6 +279,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22400,7 +16552,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,6 +333,7 @@
+@@ -335,6 +337,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -22408,16 +16560,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,8 +343,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -357,6 +360,7 @@
+@@ -363,6 +366,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -22425,7 +16568,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -530,7 +534,7 @@
+@@ -548,7 +552,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22434,7 +16577,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,16 +572,16 @@
+@@ -586,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22446,161 +16589,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -585,8 +589,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -618,21 +622,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -649,7 +656,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -657,7 +664,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -763,7 +770,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kabc/plugins/file/Makefile.in
-+++ kabc/plugins/file/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -83,24 +78,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcefile.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileplugin.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_file_la.all_cpp.P ./$(DEPDIR)/resourcefile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileplugin.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcefile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileplugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
- DIST_SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -124,6 +129,8 @@
+--- kabc/plugins/ldapkio/Makefile.in
++++ kabc/plugins/ldapkio/Makefile.in
+@@ -128,6 +128,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -22609,7 +16600,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -165,8 +172,6 @@
+@@ -169,8 +171,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -22618,7 +16609,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -243,7 +248,6 @@
+@@ -247,7 +247,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -22626,7 +16617,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -280,6 +284,9 @@
+@@ -284,6 +283,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22636,7 +16627,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,6 +342,7 @@
+@@ -339,6 +341,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -22644,16 +16635,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -363,6 +369,7 @@
+@@ -367,6 +370,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -22661,7 +16643,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -548,7 +555,7 @@
+@@ -549,7 +553,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22670,7 +16652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,16 +593,16 @@
+@@ -587,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22682,199 +16664,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -603,8 +610,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -622,7 +629,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -630,8 +637,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -669,21 +676,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -700,7 +710,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -708,7 +718,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -717,7 +727,7 @@
- test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -725,7 +735,7 @@
- uninstall-kabcincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -831,7 +841,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kabc/plugins/ldapkio/Makefile.in
-+++ kabc/plugins/ldapkio/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -86,24 +81,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourceldapkio.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioplugin.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_ldapkio_la.all_cpp.P ./$(DEPDIR)/resourceldapkio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioplugin.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourceldapkio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioplugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
- DIST_SOURCES = $(kabc_ldapkio_la_SOURCES) \
- $(libkabc_ldapkio_la_SOURCES)
-@@ -128,6 +133,8 @@
+--- kabc/plugins/Makefile.in
++++ kabc/plugins/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -22883,7 +16675,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -169,8 +176,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -22892,7 +16684,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -247,7 +252,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -22900,7 +16692,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -284,6 +288,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22910,7 +16702,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,6 +346,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -22918,16 +16710,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -348,8 +356,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -367,6 +373,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -22935,16 +16718,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -549,7 +556,7 @@
+@@ -485,7 +489,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*) \
-@@ -587,16 +594,16 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22954,201 +16737,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -604,8 +611,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -623,7 +630,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -631,8 +638,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -670,21 +677,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -701,7 +711,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -709,7 +719,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -718,7 +728,7 @@
- test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -726,7 +736,7 @@
- uninstall-kabcincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -832,7 +842,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kabc/plugins/net/Makefile.in
+++ kabc/plugins/net/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -84,24 +79,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcenet.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetplugin.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_net_la.all_cpp.P ./$(DEPDIR)/resourcenet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetplugin.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcenet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetplugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
- DIST_SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -125,6 +130,8 @@
+@@ -125,6 +125,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -23157,7 +16750,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -166,8 +173,6 @@
+@@ -166,8 +168,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -23166,7 +16759,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -244,7 +249,6 @@
+@@ -244,7 +244,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -23174,7 +16767,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -281,6 +285,9 @@
+@@ -281,6 +280,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -23184,7 +16777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -336,6 +343,7 @@
+@@ -336,6 +338,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -23192,16 +16785,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -345,8 +353,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -364,6 +370,7 @@
+@@ -364,6 +367,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -23209,7 +16793,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -546,7 +553,7 @@
+@@ -546,7 +550,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23218,7 +16802,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,16 +591,16 @@
+@@ -584,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23230,193 +16814,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -601,8 +608,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -620,7 +627,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -628,8 +635,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -667,21 +674,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -698,7 +708,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -706,7 +716,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -715,7 +725,7 @@
- test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -723,7 +733,7 @@
- uninstall-kabcincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
- done
-@@ -829,7 +839,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kabc/plugins/sql/Makefile.in
+++ kabc/plugins/sql/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kabc_sql_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,12 +57,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -75,24 +71,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcesql.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcesqlconfig.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kabc_sql_la.all_cpp.P ./$(DEPDIR)/resourcesql.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcesqlconfig.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcesql.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcesqlconfig.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabc_sql_la_SOURCES)
- DIST_SOURCES = $(kabc_sql_la_SOURCES)
- linkDATA_INSTALL = $(INSTALL_DATA)
-@@ -115,6 +118,8 @@
+@@ -115,6 +115,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -23425,7 +16825,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -156,8 +161,6 @@
+@@ -156,8 +158,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -23434,7 +16834,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -234,7 +237,6 @@
+@@ -234,7 +234,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -23442,7 +16842,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -271,6 +273,9 @@
+@@ -271,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -23452,7 +16852,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +331,7 @@
+@@ -326,6 +328,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -23460,16 +16860,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -335,8 +341,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -354,6 +358,7 @@
+@@ -354,6 +357,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -23477,7 +16868,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -528,7 +533,7 @@
+@@ -528,7 +532,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23486,7 +16877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,16 +571,16 @@
+@@ -566,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23498,94 +16889,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -583,8 +588,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -616,21 +621,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -647,7 +655,7 @@
- test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
- @list='$(link_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(linkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(linkdir)/$$f'"; \
- $(linkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(linkdir)/$$f"; \
- done
-@@ -655,7 +663,7 @@
- uninstall-linkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(link_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(linkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(linkdir)/$$f"; \
- done
-@@ -761,7 +769,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kabc/scripts/Makefile.in
+++ kabc/scripts/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -23630,16 +16935,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -23647,7 +16943,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -474,7 +476,7 @@
+@@ -474,7 +478,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23656,7 +16952,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +514,9 @@
+@@ -512,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23668,91 +16964,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,7 +586,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kabc/tests/Makefile.in
+++ kabc/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(bigread_SOURCES) $(bigwrite_SOURCES) $(kabcargl_SOURCES) $(testaddressee_SOURCES) $(testaddresseelist_SOURCES) $(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) $(testdb_SOURCES) $(testdistlist_SOURCES) $(testkabc_SOURCES) $(testkabcdlg_SOURCES) $(testldapclient_SOURCES) $(testlock_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -138,24 +140,45 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/bigread.Po ./$(DEPDIR)/bigwrite.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kabcargl.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddressee.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddresseelist.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddressfmt.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddresslineedit.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testdb.Po ./$(DEPDIR)/testdistlist.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testkabc.Po ./$(DEPDIR)/testkabcdlg.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testldapclient.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testlock.Po
-+#>+ 10
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bigread.Po ./$(DEPDIR)/bigwrite.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kabcargl.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddressee.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddresseelist.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddressfmt.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddresslineedit.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdb.Po ./$(DEPDIR)/testdistlist.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkabc.Po ./$(DEPDIR)/testkabcdlg.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testldapclient.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testlock.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(bigread_SOURCES) $(bigwrite_SOURCES) $(kabcargl_SOURCES) \
- $(testaddressee_SOURCES) $(testaddresseelist_SOURCES) \
- $(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) \
-@@ -186,6 +209,8 @@
+@@ -186,6 +186,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -23761,7 +16975,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -227,8 +252,6 @@
+@@ -227,8 +229,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -23770,7 +16984,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -305,7 +328,6 @@
+@@ -305,7 +305,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -23778,7 +16992,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -342,6 +364,9 @@
+@@ -342,6 +341,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -23788,7 +17002,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,6 +422,7 @@
+@@ -397,6 +399,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -23796,16 +17010,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +432,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -425,6 +449,7 @@
+@@ -425,6 +428,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -23813,7 +17018,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -624,7 +649,7 @@
+@@ -624,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23822,7 +17027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +687,9 @@
+@@ -662,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23834,116 +17039,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -737,21 +762,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -863,7 +891,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kabc/vcard/Makefile.in
+++ kabc/vcard/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) $(testwrite_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,12 +55,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -81,24 +77,29 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/testread.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vCard-all.Plo
-+#>+ 2
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testread.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vCard-all.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
- $(testwrite_SOURCES)
- DIST_SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
-@@ -120,6 +121,8 @@
+@@ -120,6 +120,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -23952,7 +17050,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -161,8 +164,6 @@
+@@ -161,8 +163,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -23961,7 +17059,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -239,7 +240,6 @@
+@@ -239,7 +239,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -23969,7 +17067,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -276,6 +276,9 @@
+@@ -276,6 +275,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -23979,7 +17077,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -331,6 +334,7 @@
+@@ -331,6 +333,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -23987,16 +17085,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -340,8 +344,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -359,6 +361,7 @@
+@@ -359,6 +362,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -24004,7 +17093,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -538,7 +541,7 @@
+@@ -538,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24013,7 +17102,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,16 +579,16 @@
+@@ -576,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24025,63 +17114,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -593,8 +596,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -637,21 +640,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -766,7 +772,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -845,7 +851,7 @@
+@@ -845,7 +849,7 @@
.NOEXPORT:
#>+ 2
@@ -24092,85 +17125,7 @@
docs-am:
--- kabc/vcardparser/Makefile.in
+++ kabc/vcardparser/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) $(testread2_SOURCES) $(testwrite_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -86,34 +88,44 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/testread.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testread2.Po ./$(DEPDIR)/testutils.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vcard.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardparser.Plo
-+#>+ 10
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libvcards_la.all_cpp.P $(DEPDIR)/testread2.all_cpp.P ./$(DEPDIR)/testread.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testread2.Po ./$(DEPDIR)/testutils.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vcard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardparser.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/testread.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testread2.Po ./$(DEPDIR)/testutils.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vcard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardparser.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
- $(testread2_SOURCES) $(testwrite_SOURCES)
- DIST_SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
- $(testread2_SOURCES) $(testwrite_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(vcardsincludedir)"
- vcardsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(vcardsinclude_HEADERS)
-@@ -134,6 +146,8 @@
+@@ -134,6 +134,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -24179,7 +17134,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -175,8 +189,6 @@
+@@ -175,8 +177,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -24188,7 +17143,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -253,7 +265,6 @@
+@@ -253,7 +253,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -24196,7 +17151,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -290,6 +301,9 @@
+@@ -290,6 +289,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -24206,7 +17161,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,6 +359,7 @@
+@@ -345,6 +347,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -24214,16 +17169,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -354,8 +369,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -373,6 +386,7 @@
+@@ -373,6 +376,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -24231,7 +17177,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -550,7 +564,7 @@
+@@ -550,7 +554,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24240,7 +17186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +602,9 @@
+@@ -588,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24252,76 +17198,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -638,21 +652,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -669,7 +686,7 @@
- test -z "$(vcardsincludedir)" || $(mkdir_p) "$(DESTDIR)$(vcardsincludedir)"
- @list='$(vcardsinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(vcardsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(vcardsincludedir)/$$f'"; \
- $(vcardsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(vcardsincludedir)/$$f"; \
- done
-@@ -677,7 +694,7 @@
- uninstall-vcardsincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(vcardsinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(vcardsincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(vcardsincludedir)/$$f"; \
- done
-@@ -785,7 +802,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kate/Makefile.in
-+++ kate/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,6 +86,8 @@
+--- kate/data/Makefile.in
++++ kate/data/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -24330,7 +17209,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -127,8 +129,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -24339,7 +17218,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -205,7 +205,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -24347,7 +17226,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -242,6 +241,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -24357,7 +17236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -297,6 +299,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -24365,16 +17244,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -306,8 +309,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -325,6 +326,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -24382,16 +17252,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -489,7 +491,7 @@
- all: docs-am all-recursive
+@@ -507,7 +511,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*) \
-@@ -527,9 +529,9 @@
+@@ -545,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24403,117 +17273,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -549,13 +551,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -567,7 +563,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -575,13 +571,7 @@
+@@ -773,7 +777,7 @@
+ .NOEXPORT:
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -602,7 +592,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -702,17 +692,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -741,7 +729,7 @@
- clean-generic:
+ #>+ 2
+-KDE_DIST=changelog.xml txt2tags.xml xmldebug.xml ini.xml xslt.xml rib.xml component-pascal.xml pike.xml logtalk.xml mediawiki.xml uscript.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml postscript.xml vrml.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml bibtex.xml fortran.xml javascript.xml php.xml tcl.xml ahdl.xml lua.xml r.xml perl.xml glsl.xml clipper.xml apache.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml kbasic.xml generate-php.pl Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml cue.xml objectivec.xml mup.xml scheme.xml katepartui.rc katepartreadonlyui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml progress.xml euphoria.xml alert.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.xml sml.xml sgml.xml abc.xml velocity.xml ldif.xml diff.xml desktop.xml mab.xml yacas.xml jsp.xml cg.xml coldfusion.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml ilerpg.xml lex.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml xharbour.xml lilypond.xml octave.xml cisco.xml Makefile.am makefile.xml
++KDE_DIST=txt2tags.xml changelog.xml xmldebug.xml ini.xml xslt.xml pike.xml component-pascal.xml rib.xml logtalk.xml mediawiki.xml uscript.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml vrml.xml postscript.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml fortran.xml bibtex.xml javascript.xml php.xml tcl.xml lua.xml ahdl.xml r.xml perl.xml glsl.xml apache.xml clipper.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml generate-php.pl kbasic.xml Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml objectivec.xml cue.xml mup.xml scheme.xml katepartreadonlyui.rc katepartui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml alert.xml progress.xml euphoria.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.xml sml.xml sgml.xml abc.xml velocity.xml diff.xml ldif.xml desktop.xml mab.xml yacas.xml jsp.xml coldfusion.xml cg.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml lex.xml ilerpg.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml picsrc.xml debianchangelog.xml lilypond.xml xharbour.xml cisco.xml octave.xml Makefile.am makefile.xml
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kate/data/Makefile.in
-+++ kate/data/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,15 +54,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_servicesdir)" \
-- "$(DESTDIR)$(partrcdir)" "$(DESTDIR)$(rckatedir)" \
-- "$(DESTDIR)$(syntaxkatedir)"
-+am__installdirs = "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(partrcdir)" "$(DESTDIR)$(rckatedir)" "$(DESTDIR)$(syntaxkatedir)"
- kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- partrcDATA_INSTALL = $(INSTALL_DATA)
- rckateDATA_INSTALL = $(INSTALL_DATA)
-@@ -84,6 +76,8 @@
+ #>+ 2
+ docs-am:
+--- kate/interfaces/Makefile.in
++++ kate/interfaces/Makefile.in
+@@ -115,6 +115,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -24522,7 +17293,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +119,6 @@
+@@ -156,8 +158,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -24531,7 +17302,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +195,6 @@
+@@ -234,7 +234,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -24539,7 +17310,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +231,9 @@
+@@ -271,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -24549,7 +17320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +289,7 @@
+@@ -326,6 +328,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -24557,16 +17328,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +299,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +316,7 @@
+@@ -354,6 +357,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -24574,16 +17336,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -507,7 +501,7 @@
- all: docs-am all-am
+@@ -526,7 +530,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*) \
-@@ -545,9 +539,9 @@
+@@ -564,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24593,173 +17355,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -564,7 +558,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -572,7 +566,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -581,7 +575,7 @@
- test -z "$(partrcdir)" || $(mkdir_p) "$(DESTDIR)$(partrcdir)"
- @list='$(partrc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(partrcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(partrcdir)/$$f'"; \
- $(partrcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(partrcdir)/$$f"; \
- done
-@@ -589,7 +583,7 @@
- uninstall-partrcDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(partrc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(partrcdir)/$$f'"; \
- rm -f "$(DESTDIR)$(partrcdir)/$$f"; \
- done
-@@ -598,7 +592,7 @@
- test -z "$(rckatedir)" || $(mkdir_p) "$(DESTDIR)$(rckatedir)"
- @list='$(rckate_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(rckateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rckatedir)/$$f'"; \
- $(rckateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rckatedir)/$$f"; \
- done
-@@ -606,7 +600,7 @@
- uninstall-rckateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(rckate_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(rckatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(rckatedir)/$$f"; \
- done
-@@ -615,7 +609,7 @@
- test -z "$(syntaxkatedir)" || $(mkdir_p) "$(DESTDIR)$(syntaxkatedir)"
- @list='$(syntaxkate_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(syntaxkateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(syntaxkatedir)/$$f'"; \
- $(syntaxkateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(syntaxkatedir)/$$f"; \
- done
-@@ -623,7 +617,7 @@
- uninstall-syntaxkateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(syntaxkate_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(syntaxkatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(syntaxkatedir)/$$f"; \
- done
-@@ -687,7 +681,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -773,7 +767,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=changelog.xml txt2tags.xml xmldebug.xml ini.xml xslt.xml rib.xml component-pascal.xml pike.xml logtalk.xml mediawiki.xml uscript.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml postscript.xml vrml.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml bibtex.xml fortran.xml javascript.xml php.xml tcl.xml ahdl.xml lua.xml r.xml perl.xml glsl.xml clipper.xml apache.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml kbasic.xml generate-php.pl Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml cue.xml objectivec.xml mup.xml scheme.xml katepartui.rc katepartreadonlyui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml progress.xml euphoria.xml alert.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.xml sml.xml sgml.xml abc.xml velocity.xml ldif.xml diff.xml desktop.xml mab.xml yacas.xml jsp.xml cg.xml coldfusion.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml ilerpg.xml lex.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml debianchangelog.xml picsrc.xml xharbour.xml lilypond.xml octave.xml cisco.xml Makefile.am makefile.xml
-+KDE_DIST=txt2tags.xml changelog.xml xmldebug.xml ini.xml xslt.xml pike.xml component-pascal.xml rib.xml logtalk.xml mediawiki.xml uscript.xml tibasic.xml sather.xml matlab.xml fgl-per.xml latex.xml haskell.xml vrml.xml postscript.xml fgl-4gl.xml language.dtd stata.xml idconsole.xml lpc.xml modula-2.xml inform.xml fortran.xml bibtex.xml javascript.xml php.xml tcl.xml lua.xml ahdl.xml r.xml perl.xml glsl.xml apache.xml clipper.xml debiancontrol.xml fstab.xml sci.xml rsiidl.xml cs.xml cpp.xml ansic89.xml email.xml generate-php.pl kbasic.xml Makefile.in mips.xml list-keywords-ldif.sh katesyntaxhighlightingrc java.xml prolog.xml spice.xml povray.xml gnuassembler.xml ada.xml objectivec.xml cue.xml mup.xml scheme.xml katepartreadonlyui.rc katepartui.rc c.xml sql-mysql.xml python.xml nasm.xml purebasic.xml javadoc.xml xml.xml winehq.xml mason.xml syntax.template gettext.xml commonlisp.xml ferite.xml gdl.xml alert.xml progress.xml euphoria.xml sieve.xml asm-avr.xml doxygen.xml verilog.xml idl.xml sml.xml sgml.xml abc.xml velocity.xml diff.xml ldif.xml desktop.xml mab.xml yacas.xml jsp.xml coldfusion.xml cg.xml sql.xml html.xml ocaml.xml bash.xml d.xml css.xml lex.xml ilerpg.xml katefiletyperc rexx.xml rpmspec.xml cmake.xml literate-haskell.xml list-keywords-ldif.awk pascal.xml katepart.desktop awk.xml e.xml ruby.xml sql-postgresql.xml vhdl.xml yacc.xml asp.xml cgis.xml eiffel.xml m3u.xml asm6502.xml picsrc.xml debianchangelog.xml lilypond.xml xharbour.xml cisco.xml octave.xml Makefile.am makefile.xml
-
- #>+ 2
- docs-am:
---- kate/interfaces/Makefile.in
-+++ kate/interfaces/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkatepartinterfaces_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kateincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -76,24 +72,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/interfaces.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecmd.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkatepartinterfaces_la.all_cpp.P ./$(DEPDIR)/interfaces.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmd.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/interfaces.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmd.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkatepartinterfaces_la_SOURCES)
- DIST_SOURCES = $(libkatepartinterfaces_la_SOURCES)
- kateincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -115,6 +118,8 @@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kate/Makefile.in
++++ kate/Makefile.in
+@@ -86,6 +86,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -24768,7 +17368,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -156,8 +161,6 @@
+@@ -127,8 +129,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -24777,7 +17377,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -234,7 +237,6 @@
+@@ -205,7 +205,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -24785,7 +17385,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -271,6 +273,9 @@
+@@ -242,6 +241,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -24795,7 +17395,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +331,7 @@
+@@ -297,6 +299,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -24803,16 +17403,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -335,8 +341,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -354,6 +358,7 @@
+@@ -325,6 +328,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -24820,16 +17411,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -526,7 +531,7 @@
+@@ -489,7 +493,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)
+-$(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*) \
-@@ -564,16 +569,16 @@
+@@ -527,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24839,250 +17430,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -581,8 +586,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -614,21 +619,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -645,7 +653,7 @@
- test -z "$(kateincludedir)" || $(mkdir_p) "$(DESTDIR)$(kateincludedir)"
- @list='$(kateinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kateincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kateincludedir)/$$f'"; \
- $(kateincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kateincludedir)/$$f"; \
- done
-@@ -653,7 +661,7 @@
- uninstall-kateincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kateinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kateincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kateincludedir)/$$f"; \
- done
-@@ -759,7 +767,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kate/part/Makefile.in
+++ kate/part/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(libkatepart_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -52,12 +54,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -96,24 +92,124 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/katearbitraryhighlight.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateattribute.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateautoindent.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katebookmarks.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katebuffer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecmds.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecodecompletion.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecodefoldinghelpers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecursor.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katedialogs.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katedocument.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katedocumenthelpers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katefiletype.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katefont.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katehighlight.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateindentscriptabstracts.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katejscript.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katelinerange.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateluaindentscript.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateprinter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katerenderer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateschema.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katesearch.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katespell.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katesupercursor.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katesyntaxdocument.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katetemplatehandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/katetextline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateundo.Plo ./$(DEPDIR)/kateview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateviewhelpers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateviewinternal.Plo
-+#>+ 66
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/katedocument_skel.P $(DEPDIR)/libkatepart_la.all_cpp.P ./$(DEPDIR)/katearbitraryhighlight.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateattribute.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateautoindent.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebookmarks.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebuffer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmds.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodecompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodefoldinghelpers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecursor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedialogs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocument.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocumenthelpers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefiletype.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefont.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katehighlight.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateindentscriptabstracts.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katejscript.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katelinerange.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateluaindentscript.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateprinter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katerenderer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateschema.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesearch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katespell.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesupercursor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesyntaxdocument.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetemplatehandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetextline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateundo.Plo ./$(DEPDIR)/kateview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewhelpers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewinternal.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/katedocument_skel.P ./$(DEPDIR)/katearbitraryhighlight.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateattribute.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateautoindent.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebookmarks.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebuffer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmds.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodecompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodefoldinghelpers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecursor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedialogs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocument.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocumenthelpers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefiletype.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefont.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katehighlight.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateindentscriptabstracts.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katejscript.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katelinerange.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateluaindentscript.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateprinter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katerenderer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateschema.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesearch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katespell.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesupercursor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesyntaxdocument.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetemplatehandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetextline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateundo.Plo ./$(DEPDIR)/kateview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewhelpers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewinternal.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkatepart_la_SOURCES)
- DIST_SOURCES = $(libkatepart_la_SOURCES)
- ETAGS = etags
-@@ -133,6 +229,8 @@
+@@ -133,6 +133,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -25091,7 +17443,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -174,8 +272,6 @@
+@@ -174,8 +176,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -25100,7 +17452,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -252,7 +348,6 @@
+@@ -252,7 +252,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -25108,7 +17460,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -289,6 +384,9 @@
+@@ -289,6 +288,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -25118,7 +17470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -344,6 +442,7 @@
+@@ -344,6 +346,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -25126,16 +17478,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -353,8 +452,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -372,6 +469,7 @@
+@@ -372,6 +375,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -25143,7 +17486,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -566,7 +664,7 @@
+@@ -566,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25152,7 +17495,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,16 +702,16 @@
+@@ -604,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25164,63 +17507,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -621,8 +719,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -686,21 +784,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -815,7 +916,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -924,13 +1025,6 @@
+@@ -924,13 +928,6 @@
mocs: katecodecompletion.moc
#>+ 3
@@ -25234,7 +17521,7 @@
katedocument.moc: $(srcdir)/katedocument.h
$(MOC) $(srcdir)/katedocument.h -o katedocument.moc
-@@ -938,18 +1032,18 @@
+@@ -938,18 +935,18 @@
mocs: katedocument.moc
#>+ 3
@@ -25259,7 +17546,7 @@
#>+ 3
kateviewinternal.moc: $(srcdir)/kateviewinternal.h
-@@ -959,11 +1053,11 @@
+@@ -959,11 +956,11 @@
mocs: kateviewinternal.moc
#>+ 3
@@ -25274,7 +17561,7 @@
#>+ 3
katedocumenthelpers.moc: $(srcdir)/katedocumenthelpers.h
-@@ -973,6 +1067,13 @@
+@@ -973,6 +970,13 @@
mocs: katedocumenthelpers.moc
#>+ 3
@@ -25288,7 +17575,7 @@
kateviewhelpers.moc: $(srcdir)/kateviewhelpers.h
$(MOC) $(srcdir)/kateviewhelpers.h -o kateviewhelpers.moc
-@@ -1058,7 +1159,7 @@
+@@ -1058,7 +1062,7 @@
#>+ 3
clean-metasources:
@@ -25297,7 +17584,7 @@
#>+ 2
KDE_DIST=katetextline.h kateindentscriptabstracts.h kateviewhelpers.h kateschema.h kateview.h katespell.h katearbitraryhighlight.h kateviewinternal.h kateundo.h katedocument.h katecodefoldinghelpers.h katecodecompletion.h katekeyinterceptorfunctor.h katecmds.h katefactory.h Makefile.in katejscript.h kateautoindent.h katebuffer.h katedocumenthelpers.h katerenderer.h katehighlight.h kateconfig.h kateluaindentscript.h katesyntaxdocument.h katesearch.h kateprinter.h katecursor.h kateattribute.h katetemplatehandler.h katebookmarks.h katedialogs.h configure.in.in katefiletype.h katefont.h katelinerange.h Makefile.am katesupercursor.h
-@@ -1114,7 +1215,7 @@
+@@ -1114,7 +1118,7 @@
#>+ 11
@@ -25306,21 +17593,9 @@
@echo 'creating libkatepart_la.all_cpp.cpp ...'; \
rm -f libkatepart_la.all_cpp.files libkatepart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkatepart_la.all_cpp.final; \
---- kate/plugins/Makefile.in
-+++ kate/plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
+--- kate/plugins/autobookmarker/Makefile.in
++++ kate/plugins/autobookmarker/Makefile.in
+@@ -113,6 +113,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -25329,7 +17604,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
+@@ -154,8 +156,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -25338,7 +17613,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
+@@ -232,7 +232,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -25346,7 +17621,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
+@@ -269,6 +268,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -25356,7 +17631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
+@@ -324,6 +326,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -25364,16 +17639,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -352,6 +355,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -25381,16 +17647,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +487,7 @@
- all: docs-am all-recursive
+@@ -525,7 +529,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*) \
-@@ -523,9 +525,9 @@
+@@ -563,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25400,161 +17666,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kate/plugins/autobookmarker/Makefile.in
-+++ kate/plugins/autobookmarker/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" \
-- "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- ktexteditor_autobookmarker_la_DEPENDENCIES = \
-@@ -73,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/autobookmarker.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autobookmarker.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
- confDATA_INSTALL = $(INSTALL_DATA)
-@@ -113,6 +111,8 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kate/plugins/insertfile/Makefile.in
++++ kate/plugins/insertfile/Makefile.in
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -25563,7 +17679,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -154,8 +154,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -25572,7 +17688,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -232,7 +230,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -25580,7 +17696,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -269,6 +266,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -25590,7 +17706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -324,6 +324,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -25598,16 +17714,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -333,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -352,6 +351,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -25615,7 +17722,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +525,7 @@
+@@ -526,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25624,7 +17731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,16 +563,16 @@
+@@ -564,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25636,173 +17743,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -580,8 +580,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -612,21 +612,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -643,7 +646,7 @@
- test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
- @list='$(conf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
- $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
- done
-@@ -651,7 +654,7 @@
- uninstall-confDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(conf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
- rm -f "$(DESTDIR)$(confdir)/$$f"; \
- done
-@@ -660,7 +663,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -668,7 +671,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -774,7 +777,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kate/plugins/insertfile/Makefile.in
-+++ kate/plugins/insertfile/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(ktexteditor_insertfile_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,15 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(insertfiledatadir)" \
-- "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(insertfiledatadir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- ktexteditor_insertfile_la_DEPENDENCIES = \
-@@ -74,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/insertfileplugin.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/insertfileplugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_insertfile_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_insertfile_la_SOURCES)
- insertfiledataDATA_INSTALL = $(INSTALL_DATA)
-@@ -114,6 +111,8 @@
+--- kate/plugins/isearch/Makefile.in
++++ kate/plugins/isearch/Makefile.in
+@@ -112,6 +112,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -25811,7 +17754,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +154,6 @@
+@@ -153,8 +155,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -25820,7 +17763,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +230,6 @@
+@@ -231,7 +231,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -25828,7 +17771,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +266,9 @@
+@@ -268,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -25838,7 +17781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +324,7 @@
+@@ -323,6 +325,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -25846,16 +17789,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +351,7 @@
+@@ -351,6 +354,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -25863,7 +17797,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -526,7 +525,7 @@
+@@ -524,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25872,7 +17806,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,16 +563,16 @@
+@@ -562,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25884,172 +17818,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -581,8 +580,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -613,21 +612,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -644,7 +646,7 @@
- test -z "$(insertfiledatadir)" || $(mkdir_p) "$(DESTDIR)$(insertfiledatadir)"
- @list='$(insertfiledata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(insertfiledataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(insertfiledatadir)/$$f'"; \
- $(insertfiledataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(insertfiledatadir)/$$f"; \
- done
-@@ -652,7 +654,7 @@
- uninstall-insertfiledataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(insertfiledata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(insertfiledatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(insertfiledatadir)/$$f"; \
- done
-@@ -661,7 +663,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -669,7 +671,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -775,7 +777,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kate/plugins/isearch/Makefile.in
-+++ kate/plugins/isearch/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(ktexteditor_isearch_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- ktexteditor_isearch_la_DEPENDENCIES = \
-@@ -72,24 +67,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ISearchPlugin.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ISearchPlugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_isearch_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_isearch_la_SOURCES)
- isearchdataDATA_INSTALL = $(INSTALL_DATA)
-@@ -112,6 +110,8 @@
+--- kate/plugins/kdatatool/Makefile.in
++++ kate/plugins/kdatatool/Makefile.in
+@@ -113,6 +113,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -26058,7 +17829,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +153,6 @@
+@@ -154,8 +156,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -26067,7 +17838,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +229,6 @@
+@@ -232,7 +232,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -26075,7 +17846,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +265,9 @@
+@@ -269,6 +268,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -26085,7 +17856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +323,7 @@
+@@ -324,6 +326,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -26093,16 +17864,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +350,7 @@
+@@ -352,6 +355,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -26110,7 +17872,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -524,7 +524,7 @@
+@@ -525,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26119,7 +17881,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,16 +562,16 @@
+@@ -563,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26131,172 +17893,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -579,8 +579,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -611,21 +611,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -642,7 +645,7 @@
- test -z "$(isearchdatadir)" || $(mkdir_p) "$(DESTDIR)$(isearchdatadir)"
- @list='$(isearchdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(isearchdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(isearchdatadir)/$$f'"; \
- $(isearchdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(isearchdatadir)/$$f"; \
- done
-@@ -650,7 +653,7 @@
- uninstall-isearchdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(isearchdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(isearchdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(isearchdatadir)/$$f"; \
- done
-@@ -659,7 +662,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -667,7 +670,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -773,7 +776,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kate/plugins/kdatatool/Makefile.in
-+++ kate/plugins/kdatatool/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- ktexteditor_kdatatool_la_DEPENDENCIES = \
-@@ -73,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kate_kdatatool.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kate_kdatatool.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
- kdatatooldataDATA_INSTALL = $(INSTALL_DATA)
-@@ -113,6 +111,8 @@
+--- kate/plugins/Makefile.in
++++ kate/plugins/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -26305,7 +17904,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -154,8 +154,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -26314,7 +17913,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -232,7 +230,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -26322,7 +17921,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -269,6 +266,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -26332,7 +17931,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -324,6 +324,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -26340,16 +17939,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -333,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -352,6 +351,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -26357,16 +17947,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +525,7 @@
+@@ -485,7 +489,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*) \
-@@ -563,16 +563,16 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26376,175 +17966,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -580,8 +580,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -612,21 +612,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -643,7 +646,7 @@
- test -z "$(kdatatooldatadir)" || $(mkdir_p) "$(DESTDIR)$(kdatatooldatadir)"
- @list='$(kdatatooldata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdatatooldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdatatooldatadir)/$$f'"; \
- $(kdatatooldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdatatooldatadir)/$$f"; \
- done
-@@ -651,7 +654,7 @@
- uninstall-kdatatooldataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdatatooldata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdatatooldatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdatatooldatadir)/$$f"; \
- done
-@@ -660,7 +663,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -668,7 +671,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -774,7 +777,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kate/plugins/wordcompletion/Makefile.in
+++ kate/plugins/wordcompletion/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,15 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(docwordcompletiondatadir)" \
-- "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(docwordcompletiondatadir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- ktexteditor_docwordcompletion_la_DEPENDENCIES = \
-@@ -74,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/docwordcompletion.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/docwordcompletion.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
- docwordcompletiondataDATA_INSTALL = $(INSTALL_DATA)
-@@ -114,6 +111,8 @@
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -26553,7 +17979,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +154,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -26562,7 +17988,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +230,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -26570,7 +17996,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +266,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -26580,7 +18006,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +324,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -26588,16 +18014,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +351,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -26605,7 +18022,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -526,7 +525,7 @@
+@@ -526,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26614,7 +18031,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,16 +563,16 @@
+@@ -564,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26626,129 +18043,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -581,8 +580,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -613,21 +612,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -644,7 +646,7 @@
- test -z "$(docwordcompletiondatadir)" || $(mkdir_p) "$(DESTDIR)$(docwordcompletiondatadir)"
- @list='$(docwordcompletiondata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(docwordcompletiondataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docwordcompletiondatadir)/$$f'"; \
- $(docwordcompletiondataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docwordcompletiondatadir)/$$f"; \
- done
-@@ -652,7 +654,7 @@
- uninstall-docwordcompletiondataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(docwordcompletiondata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(docwordcompletiondatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(docwordcompletiondatadir)/$$f"; \
- done
-@@ -661,7 +663,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -669,7 +671,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -775,7 +777,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kate/scripts/Makefile.in
+++ kate/scripts/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,14 +54,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(indentscriptskatedir)" \
-- "$(DESTDIR)$(scriptskatedir)"
-+am__installdirs = "$(DESTDIR)$(indentscriptskatedir)" "$(DESTDIR)$(scriptskatedir)"
- indentscriptskateDATA_INSTALL = $(INSTALL_DATA)
- scriptskateDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(indentscriptskate_DATA) $(scriptskate_DATA)
-@@ -80,6 +73,8 @@
+@@ -80,6 +80,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -26757,7 +18054,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -121,8 +116,6 @@
+@@ -121,8 +123,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -26766,7 +18063,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -199,7 +192,6 @@
+@@ -199,7 +199,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -26774,7 +18071,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -236,6 +228,9 @@
+@@ -236,6 +235,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -26784,7 +18081,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -291,6 +286,7 @@
+@@ -291,6 +293,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -26792,16 +18089,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,8 +296,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -319,6 +313,7 @@
+@@ -319,6 +322,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -26809,7 +18097,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -484,7 +479,7 @@
+@@ -484,7 +488,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26818,7 +18106,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +517,9 @@
+@@ -522,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26830,125 +18118,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -541,7 +536,7 @@
- test -z "$(indentscriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(indentscriptskatedir)"
- @list='$(indentscriptskate_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(indentscriptskateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(indentscriptskatedir)/$$f'"; \
- $(indentscriptskateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(indentscriptskatedir)/$$f"; \
- done
-@@ -549,7 +544,7 @@
- uninstall-indentscriptskateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(indentscriptskate_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(indentscriptskatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(indentscriptskatedir)/$$f"; \
- done
-@@ -558,7 +553,7 @@
- test -z "$(scriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(scriptskatedir)"
- @list='$(scriptskate_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(scriptskateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptskatedir)/$$f'"; \
- $(scriptskateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptskatedir)/$$f"; \
- done
-@@ -566,7 +561,7 @@
- uninstall-scriptskateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(scriptskate_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(scriptskatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(scriptskatedir)/$$f"; \
- done
-@@ -630,7 +625,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kcert/Makefile.in
+++ kcert/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkcertpart_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(rcdir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -71,24 +66,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcertpart.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kcertpart.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkcertpart_la_SOURCES)
- DIST_SOURCES = $(libkcertpart_la_SOURCES)
- rcDATA_INSTALL = $(INSTALL_DATA)
-@@ -111,6 +109,8 @@
+@@ -111,6 +111,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -26957,7 +18129,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -152,8 +152,6 @@
+@@ -152,8 +154,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -26966,7 +18138,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -230,7 +228,6 @@
+@@ -230,7 +230,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -26974,7 +18146,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -267,6 +264,9 @@
+@@ -267,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -26984,7 +18156,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,6 +322,7 @@
+@@ -322,6 +324,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -26992,16 +18164,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -331,8 +332,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -350,6 +349,7 @@
+@@ -350,6 +353,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -27009,7 +18172,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -523,7 +523,7 @@
+@@ -523,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27018,7 +18181,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,16 +561,16 @@
+@@ -561,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27030,179 +18193,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -578,8 +578,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -610,21 +610,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -641,7 +644,7 @@
- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
- @list='$(rc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
- $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -649,7 +652,7 @@
- uninstall-rcDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(rc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
- rm -f "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -658,7 +661,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -666,7 +669,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -772,7 +775,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kcmshell/Makefile.in
+++ kcmshell/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,6 +37,10 @@
-
-
-
-+#>- SOURCES = $(kcmshell_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -76,14 +80,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -104,27 +101,29 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kcmshell.la.Po $(DEPDIR)/kcmshell_dummy.Plo $(DEPDIR)/main_skel.P $(DEPDIR)/libkdeinit_kcmshell_la.all_cpp.P ./$(DEPDIR)/main.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kcmshell.la.Po $(DEPDIR)/kcmshell_dummy.Plo $(DEPDIR)/main_skel.P ./$(DEPDIR)/main.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kcmshell_la_SOURCES)
--#>+ 1
--SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES)
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kcmshell_la_SOURCES)
- #>- DIST_SOURCES = $(kcmshell_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES)
-@@ -146,6 +145,8 @@
+@@ -146,6 +146,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -27211,7 +18204,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -187,8 +188,6 @@
+@@ -187,8 +189,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -27220,7 +18213,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -265,7 +264,6 @@
+@@ -265,7 +265,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -27228,7 +18221,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -302,6 +300,9 @@
+@@ -302,6 +301,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -27238,7 +18231,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -357,6 +358,7 @@
+@@ -357,6 +359,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -27246,16 +18239,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -366,8 +368,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -385,6 +385,7 @@
+@@ -385,6 +388,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -27263,7 +18247,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -562,7 +563,7 @@
+@@ -562,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27272,7 +18256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,16 +601,16 @@
+@@ -600,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27284,162 +18268,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -617,8 +618,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -636,7 +637,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -644,8 +645,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -701,21 +702,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -832,7 +836,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kconf_update/Makefile.in
+++ kconf_update/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,10 @@
- # Boston, MA 02110-1301, USA.
-
-
-+#>- SOURCES = $(kconf_update_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -72,14 +76,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -101,27 +98,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kconf_update.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.la.Po $(DEPDIR)/kconf_update_dummy.Plo ./$(DEPDIR)/kconf_update.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kconf_update_la_SOURCES)
--#>+ 1
--SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kconf_update_la_SOURCES)
- #>- DIST_SOURCES = $(kconf_update_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
-@@ -142,6 +140,8 @@
+@@ -142,6 +142,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -27448,7 +18279,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -183,8 +183,6 @@
+@@ -183,8 +185,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -27457,7 +18288,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -261,7 +259,6 @@
+@@ -261,7 +261,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -27465,7 +18296,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -298,6 +295,9 @@
+@@ -298,6 +297,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -27475,7 +18306,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -353,6 +353,7 @@
+@@ -353,6 +355,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -27483,16 +18314,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,8 +363,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -381,6 +380,7 @@
+@@ -381,6 +384,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -27500,7 +18322,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -554,7 +554,7 @@
+@@ -554,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27509,7 +18331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,16 +592,16 @@
+@@ -592,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27521,468 +18343,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -609,8 +609,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -628,7 +628,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -636,8 +636,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -693,21 +693,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -823,7 +826,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdecore/Makefile.in
-+++ kdecore/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -41,6 +41,8 @@
-
-
-
-+SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) $(kgrantpty_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -81,15 +83,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES = kde-config.cpp
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(colorsdir)" \
-- "$(DESTDIR)$(kdebugdir)" "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(colorsdir)" "$(DESTDIR)$(kdebugdir)" "$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
- ARFLAGS = cru
-@@ -104,6 +98,12 @@
- vsnprintf_nonpic.$(OBJEXT)
- @KDE_USE_FINAL_FALSE at libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE at libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_final_OBJECTS)
-+libkdefakes_pic_a_AR = $(AR) $(ARFLAGS)
-+libkdefakes_pic_a_LIBADD =
-+libkdefakes_pic_a_SOURCES = libkdefakes_pic.c
-+#>- libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
-+#>+ 1
-+libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- @include_SVGICONS_TRUE at am__DEPENDENCIES_1 = \
-@@ -205,36 +205,319 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I. -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/fakes.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/fakes_nonpic.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdata.Plo ./$(DEPDIR)/kaccel.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kallocator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kappdcopiface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kapplication.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kasyncio.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplayer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbufferedio.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystem.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemgregorian.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhebrew.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhijri.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemjalali.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcatalogue.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharsets.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcheckaccelerators.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kckey.Plo ./$(DEPDIR)/kclipboard.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargs.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletion.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbackend.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialogmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigskeleton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcrash.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdcoppropertyproxy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kde-config.Po ./$(DEPDIR)/kdebug.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdebugdcopiface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesktopfile.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeversion.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kextsock.Plo ./$(DEPDIR)/kglobal.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel_x11.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobalsettings.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kgrantpty-kgrantpty.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconeffect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconloader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicontheme.Plo ./$(DEPDIR)/kidna.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinstance.Plo ./$(DEPDIR)/kipc.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeynative_x11.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeyserver_x11.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klibloader.Plo ./$(DEPDIR)/klocale.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klockfile.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpander.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmanagerselection.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodec.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimesourcefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmountpoint.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmultipledrag.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifyclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpalette.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapprovider.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprocctrl.Plo ./$(DEPDIR)/kprocess.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprocio.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo_kdecore.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfofactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpty.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kqiodevicegzip_p.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequence.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kregexp.Plo ./$(DEPDIR)/krfcdate.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krootprop.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksavefile.Plo ./$(DEPDIR)/kshell.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcut.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutlist.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutmenu.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksock.Plo ./$(DEPDIR)/ksockaddr.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocks.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstandarddirs.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstartupinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstaticdeleter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdaccel.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycoca.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocadict.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocafactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktempdir.Plo ./$(DEPDIR)/ktempfile.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimezones.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapplication.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurl.Plo ./$(DEPDIR)/kurldrag.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuser.Plo ./$(DEPDIR)/kvmallocator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwin.Plo ./$(DEPDIR)/kwinmodule.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmessages.Plo ./$(DEPDIR)/libintl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdefakes_pic.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/netsupp.Plo ./$(DEPDIR)/netwm.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf_nonpic.Po
-+#>+ 188
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/ksycoca_skel.P $(DEPDIR)/kappdcopiface_skel.P $(DEPDIR)/kdebugdcopiface_skel.P $(DEPDIR)/libkdecore_la.all_cpp.P ./$(DEPDIR)/fakes.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fakes_nonpic.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdata.Plo ./$(DEPDIR)/kaccel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kallocator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kappdcopiface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapplication.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kasyncio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplayer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbufferedio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemgregorian.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhebrew.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhijri.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemjalali.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcatalogue.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsets.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcheckaccelerators.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kckey.Plo ./$(DEPDIR)/kclipboard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialogmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigskeleton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcrash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcoppropertyproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-config.Po ./$(DEPDIR)/kdebug.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugdcopiface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktopfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeversion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kextsock.Plo ./$(DEPDIR)/kglobal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel_x11.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kgrantpty-kgrantpty.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconeffect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicontheme.Plo ./$(DEPDIR)/kidna.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinstance.Plo ./$(DEPDIR)/kipc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeynative_x11.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeyserver_x11.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klibloader.Plo ./$(DEPDIR)/klocale.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klockfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpander.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmanagerselection.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodec.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimesourcefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmountpoint.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultipledrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifyclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpalette.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapprovider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocctrl.Plo ./$(DEPDIR)/kprocess.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo_kdecore.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfofactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpty.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kqiodevicegzip_p.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequence.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kregexp.Plo ./$(DEPDIR)/krfcdate.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootprop.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksavefile.Plo ./$(DEPDIR)/kshell.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcut.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutlist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksock.Plo ./$(DEPDIR)/ksockaddr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocks.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstandarddirs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstaticdeleter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaccel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycoca.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocadict.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocafactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempdir.Plo ./$(DEPDIR)/ktempfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezones.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapplication.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurl.Plo ./$(DEPDIR)/kurldrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuser.Plo ./$(DEPDIR)/kvmallocator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin.Plo ./$(DEPDIR)/kwinmodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmessages.Plo ./$(DEPDIR)/libintl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdefakes_pic.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/netsupp.Plo ./$(DEPDIR)/netwm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf_nonpic.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/ksycoca_skel.P $(DEPDIR)/kappdcopiface_skel.P $(DEPDIR)/kdebugdcopiface_skel.P ./$(DEPDIR)/fakes.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fakes_nonpic.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdata.Plo ./$(DEPDIR)/kaccel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kallocator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kappdcopiface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapplication.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kasyncio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplayer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbufferedio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemgregorian.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhebrew.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhijri.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemjalali.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcatalogue.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsets.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcheckaccelerators.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kckey.Plo ./$(DEPDIR)/kclipboard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialogmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigskeleton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcrash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcoppropertyproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-config.Po ./$(DEPDIR)/kdebug.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugdcopiface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktopfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeversion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kextsock.Plo ./$(DEPDIR)/kglobal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel_x11.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kgrantpty-kgrantpty.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconeffect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicontheme.Plo ./$(DEPDIR)/kidna.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinstance.Plo ./$(DEPDIR)/kipc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeynative_x11.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeyserver_x11.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klibloader.Plo ./$(DEPDIR)/klocale.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klockfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpander.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmanagerselection.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodec.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimesourcefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmountpoint.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultipledrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifyclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpalette.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapprovider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocctrl.Plo ./$(DEPDIR)/kprocess.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo_kdecore.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfofactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpty.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kqiodevicegzip_p.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequence.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kregexp.Plo ./$(DEPDIR)/krfcdate.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootprop.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksavefile.Plo ./$(DEPDIR)/kshell.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcut.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutlist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksock.Plo ./$(DEPDIR)/ksockaddr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocks.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstandarddirs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstaticdeleter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaccel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycoca.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocadict.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocafactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempdir.Plo ./$(DEPDIR)/ktempfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezones.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapplication.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurl.Plo ./$(DEPDIR)/kurldrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuser.Plo ./$(DEPDIR)/kvmallocator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin.Plo ./$(DEPDIR)/kwinmodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmessages.Plo ./$(DEPDIR)/libintl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdefakes_pic.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/netsupp.Plo ./$(DEPDIR)/netwm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf_nonpic.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) \
-- $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) \
-- $(kgrantpty_SOURCES)
--DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) \
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
-+ $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
-+ $(kde_config_SOURCES) $(kgrantpty_SOURCES)
-+DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
- $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
- $(kde_config_SOURCES) $(kgrantpty_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -273,6 +556,8 @@
+--- kdecore/kconfig_compiler/Makefile.in
++++ kdecore/kconfig_compiler/Makefile.in
+@@ -138,6 +138,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -27991,7 +18354,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -314,8 +599,6 @@
+@@ -179,8 +181,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -28000,7 +18363,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -392,7 +675,6 @@
+@@ -257,7 +257,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -28008,7 +18371,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -429,6 +711,9 @@
+@@ -294,6 +293,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -28018,7 +18381,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,6 +769,7 @@
+@@ -349,6 +351,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -28026,16 +18389,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -493,8 +779,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -512,6 +796,7 @@
+@@ -377,6 +380,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -28043,25 +18397,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -677,7 +962,7 @@
- # into $(all_libraries) isn't better
- AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
- lib_LTLIBRARIES = libkdefakes.la libkdecore.la
--lib_LIBRARIES = libkdefakes_nonpic.a
-+lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
- include_HEADERS = kconfig.h kconfigskeleton.h \
- kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
- kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-@@ -818,7 +1103,7 @@
+@@ -558,7 +562,7 @@
.SUFFIXES:
- .SUFFIXES: .c .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)
+ .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*) \
-@@ -856,9 +1141,9 @@
+@@ -596,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28071,456 +18416,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- kdemacros.h: stamp-h3
-@@ -870,10 +1155,6 @@
- stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
- @rm -f stamp-h3
- cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
--$(srcdir)/kdemacros.h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
-- rm -f stamp-h3
-- touch $@
-
- distclean-hdr:
- -rm -f kdemacros.h stamp-h3
-@@ -884,7 +1165,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -892,7 +1173,7 @@
- @$(POST_INSTALL)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- p=$(am__strip_dir) \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
- $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
- else :; fi; \
-@@ -901,7 +1182,7 @@
- uninstall-libLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -917,7 +1198,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -925,8 +1206,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -1096,6 +1377,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kxerrorhandler.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kxmessages.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libintl.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdefakes_pic.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netsupp.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netwm.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vsnprintf.Plo at am__quote@
-@@ -1105,56 +1387,72 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- kgrantpty-kgrantpty.o: kgrantpty.c
- @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.o -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kgrantpty.c' object='kgrantpty-kgrantpty.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kgrantpty-kgrantpty.Po' tmpdepfile='$(DEPDIR)/kgrantpty-kgrantpty.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
-
- kgrantpty-kgrantpty.obj: kgrantpty.c
- @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.obj -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kgrantpty.c' object='kgrantpty-kgrantpty.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kgrantpty-kgrantpty.Po' tmpdepfile='$(DEPDIR)/kgrantpty-kgrantpty.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`
-
-+kgrantpty-kgrantpty.lo: kgrantpty.c
-+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.lo -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.lo `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Plo"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kgrantpty.c' object='kgrantpty-kgrantpty.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kgrantpty-kgrantpty.Plo' tmpdepfile='$(DEPDIR)/kgrantpty-kgrantpty.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.lo `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
-+
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -1171,7 +1469,7 @@
- test -z "$(colorsdir)" || $(mkdir_p) "$(DESTDIR)$(colorsdir)"
- @list='$(colors_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(colorsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(colorsdir)/$$f'"; \
- $(colorsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(colorsdir)/$$f"; \
- done
-@@ -1179,7 +1477,7 @@
- uninstall-colorsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(colors_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(colorsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(colorsdir)/$$f"; \
- done
-@@ -1188,7 +1486,7 @@
- test -z "$(kdebugdir)" || $(mkdir_p) "$(DESTDIR)$(kdebugdir)"
- @list='$(kdebug_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdebugDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdebugdir)/$$f'"; \
- $(kdebugDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdebugdir)/$$f"; \
- done
-@@ -1196,7 +1494,7 @@
- uninstall-kdebugDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdebug_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdebugdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdebugdir)/$$f"; \
- done
-@@ -1205,7 +1503,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -1213,7 +1511,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -1225,13 +1523,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1243,7 +1535,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1251,13 +1543,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1278,7 +1564,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1381,14 +1667,12 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1423,7 +1707,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
- maintainer-clean-generic:
-@@ -1502,14 +1786,14 @@
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-colorsDATA \
- install-data install-data-am install-data-local install-exec \
-- install-exec-am install-exec-hook install-includeHEADERS \
-- install-info install-info-am install-kdebugDATA \
-- install-libLIBRARIES install-libLTLIBRARIES install-man \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-compile \
-- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+ install-exec-am install-includeHEADERS install-info \
-+ install-info-am install-kdebugDATA install-libLIBRARIES \
-+ install-libLTLIBRARIES install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-colorsDATA \
- uninstall-includeHEADERS uninstall-info-am \
- uninstall-kdebugDATA uninstall-libLIBRARIES \
-@@ -1524,6 +1808,12 @@
- -rm -f vsnprintf_nonpic.c
- $(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
-
-+libkdefakes_pic.a: libkdefakes.la
-+ -rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
-+ cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
-+ ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
-+ ranlib libkdefakes_pic.a
-+
- .PHONY: kckey_h parser
- kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
- (cd $(srcdir) && ./generate_keys.sh $(QNAMESPACE_H))
-@@ -1835,18 +2125,18 @@
- mocs: ksock.moc
-
- #>+ 3
--kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
-- $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
-+kprocess.moc: $(srcdir)/kprocess.h
-+ $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
-
- #>+ 2
--mocs: kglobalaccel_win.moc
-+mocs: kprocess.moc
-
- #>+ 3
--kprocess.moc: $(srcdir)/kprocess.h
-- $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
-+kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
-+ $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
-
- #>+ 2
--mocs: kprocess.moc
-+mocs: kglobalaccel_win.moc
-
- #>+ 3
- kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
-@@ -1884,18 +2174,18 @@
- mocs: klibloader.moc
-
- #>+ 3
--ksycoca.moc: $(srcdir)/ksycoca.h
-- $(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
-+kdesktopfile.moc: $(srcdir)/kdesktopfile.h
-+ $(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
-
- #>+ 2
--mocs: ksycoca.moc
-+mocs: kdesktopfile.moc
-
- #>+ 3
--kdesktopfile.moc: $(srcdir)/kdesktopfile.h
-- $(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
-+ksycoca.moc: $(srcdir)/ksycoca.h
-+ $(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
-
- #>+ 2
--mocs: kdesktopfile.moc
-+mocs: ksycoca.moc
-
- #>+ 3
- kaccelprivate.moc: $(srcdir)/kaccelprivate.h
-@@ -1913,7 +2203,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kglobalaccel_win.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
-+ -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
-
- #>+ 2
- KDE_DIST=README.kiosk standard_weak.nmcheck libkdecore_weak.nmcheck Makefile.in README.exec kglobalaccel_mac.h netsupp_win32.cpp libkdecore.nmcheck kappdcopiface.h DESIGN.iconloading kglobalaccel_win.cpp README.user_profiles Web.colors kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h Rainbow.colors kdebugrc 40.colors kdebug.areas kdebugdcopiface.h Royal.colors kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in
-@@ -1971,7 +2261,7 @@
-
-
- #>+ 11
--libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kconfigdialogmanager.moc kprocctrl.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
-+libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kconfigdialogmanager.moc kprocctrl.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
- @echo 'creating libkdecore_la.all_cpp.cpp ...'; \
- rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
---- kdecore/kconfig_compiler/Makefile.in
-+++ kdecore/kconfig_compiler/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(autoexample_SOURCES) $(example_SOURCES) $(kconfig_compiler_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -85,24 +87,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/autoexample.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/example.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/exampleprefs_base.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfig_compiler.Po
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/general_base.P $(DEPDIR)/myoptions_base.P $(DEPDIR)/autoexample.all_cpp.P $(DEPDIR)/example.all_cpp.P ./$(DEPDIR)/autoexample.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/example.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exampleprefs_base.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig_compiler.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/general_base.P $(DEPDIR)/myoptions_base.P ./$(DEPDIR)/autoexample.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/example.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/exampleprefs_base.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig_compiler.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
- $(kconfig_compiler_SOURCES)
- DIST_SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
-@@ -138,6 +153,8 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- kdecore/kconfig_compiler/tests/Makefile.in
++++ kdecore/kconfig_compiler/tests/Makefile.in
+@@ -194,6 +194,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -28529,7 +18429,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -179,8 +196,6 @@
+@@ -235,8 +237,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -28538,7 +18438,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -257,7 +272,6 @@
+@@ -313,7 +313,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -28546,7 +18446,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -294,6 +308,9 @@
+@@ -350,6 +349,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -28556,7 +18456,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,6 +366,7 @@
+@@ -405,6 +407,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -28564,16 +18464,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -358,8 +376,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -377,6 +393,7 @@
+@@ -433,6 +436,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -28581,7 +18472,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -558,7 +575,7 @@
+@@ -642,7 +646,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28590,7 +18481,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +613,9 @@
+@@ -680,9 +684,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28600,210 +18491,48 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -660,21 +677,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ clean-checkLTLIBRARIES:
+@@ -1040,7 +1044,7 @@
+ .NOEXPORT:
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ #>+ 2
+-KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test8a.cpp.ref test_dpointer.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test9.kcfgc test7.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am
++KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg test8b.kcfg Makefile.in test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test_dpointer.cpp.ref test8a.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test7.kcfgc test9.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am
- mostlyclean-libtool:
-@@ -694,13 +714,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -712,7 +726,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -720,13 +734,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -747,7 +755,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -846,17 +854,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -891,7 +897,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdecore/kconfig_compiler/tests/Makefile.in
-+++ kdecore/kconfig_compiler/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(kunittest_kconfigcompiler_test_la_SOURCES) $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) $(test7_SOURCES) $(test8_SOURCES) $(test9_SOURCES) $(test_dpointer_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -149,24 +151,64 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kconfigcompiler_test.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test1.Po ./$(DEPDIR)/test1main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test2.Po ./$(DEPDIR)/test2main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test3.Po ./$(DEPDIR)/test3main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test4.Po ./$(DEPDIR)/test4main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test5.Po ./$(DEPDIR)/test5main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test6.Po ./$(DEPDIR)/test6main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test7.Po ./$(DEPDIR)/test7main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test8a.Po ./$(DEPDIR)/test8b.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test8main.Po ./$(DEPDIR)/test9.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test9main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer_main.Po
-+#>+ 26
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/test1.all_cpp.P $(DEPDIR)/test2.all_cpp.P $(DEPDIR)/test3.all_cpp.P $(DEPDIR)/test4.all_cpp.P $(DEPDIR)/test5.all_cpp.P $(DEPDIR)/test6.all_cpp.P $(DEPDIR)/test7.all_cpp.P $(DEPDIR)/test8.all_cpp.P $(DEPDIR)/test9.all_cpp.P $(DEPDIR)/test_dpointer.all_cpp.P ./$(DEPDIR)/kconfigcompiler_test.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test1.Po ./$(DEPDIR)/test1main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test2.Po ./$(DEPDIR)/test2main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test3.Po ./$(DEPDIR)/test3main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test4.Po ./$(DEPDIR)/test4main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test5.Po ./$(DEPDIR)/test5main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test6.Po ./$(DEPDIR)/test6main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test7.Po ./$(DEPDIR)/test7main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8a.Po ./$(DEPDIR)/test8b.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8main.Po ./$(DEPDIR)/test9.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test9main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer_main.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kconfigcompiler_test.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test1.Po ./$(DEPDIR)/test1main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test2.Po ./$(DEPDIR)/test2main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test3.Po ./$(DEPDIR)/test3main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test4.Po ./$(DEPDIR)/test4main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test5.Po ./$(DEPDIR)/test5main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test6.Po ./$(DEPDIR)/test6main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test7.Po ./$(DEPDIR)/test7main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8a.Po ./$(DEPDIR)/test8b.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8main.Po ./$(DEPDIR)/test9.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test9main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer_main.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ docs-am:
+--- kdecore/Makefile.in
++++ kdecore/Makefile.in
+@@ -104,6 +104,12 @@
+ vsnprintf_nonpic.$(OBJEXT)
+ @KDE_USE_FINAL_FALSE at libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_final_OBJECTS)
++libkdefakes_pic_a_AR = $(AR) $(ARFLAGS)
++libkdefakes_pic_a_LIBADD =
++libkdefakes_pic_a_SOURCES = libkdefakes_pic.c
++#>- libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
++#>+ 1
++libkdefakes_pic_a_OBJECTS = libkdefakes_pic.$(OBJEXT)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ @include_SVGICONS_TRUE at am__DEPENDENCIES_1 = \
+@@ -231,10 +237,10 @@
#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kunittest_kconfigcompiler_test_la_SOURCES) \
- $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) \
- $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) \
-@@ -194,6 +236,8 @@
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) \
+- $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) \
+- $(kgrantpty_SOURCES)
+-DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) \
++SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
++ $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
++ $(kde_config_SOURCES) $(kgrantpty_SOURCES)
++DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
+ $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
+ $(kde_config_SOURCES) $(kgrantpty_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -273,6 +279,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -28812,7 +18541,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -235,8 +279,6 @@
+@@ -314,8 +322,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -28821,7 +18550,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -313,7 +355,6 @@
+@@ -392,7 +398,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -28829,7 +18558,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -350,6 +391,9 @@
+@@ -429,6 +434,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -28839,7 +18568,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,6 +449,7 @@
+@@ -484,6 +492,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -28847,16 +18576,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +459,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -433,6 +476,7 @@
+@@ -512,6 +521,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -28864,16 +18584,25 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -642,7 +686,7 @@
+@@ -677,7 +687,7 @@
+ # into $(all_libraries) isn't better
+ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+ lib_LTLIBRARIES = libkdefakes.la libkdecore.la
+-lib_LIBRARIES = libkdefakes_nonpic.a
++lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
+ include_HEADERS = kconfig.h kconfigskeleton.h \
+ kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
+ kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
+@@ -818,7 +828,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: .c .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*) \
-@@ -680,9 +724,9 @@
+@@ -856,9 +866,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28884,96 +18613,108 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-checkLTLIBRARIES:
-@@ -766,21 +810,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ kdemacros.h: stamp-h3
+@@ -870,7 +880,7 @@
+ stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
+ @rm -f stamp-h3
+ cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
+-$(srcdir)/kdemacros.h.in: $(am__configure_deps)
++$(srcdir)/kdemacros.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h3
+ touch $@
+@@ -1096,6 +1106,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kxerrorhandler.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kxmessages.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libintl.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdefakes_pic.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netsupp.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netwm.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vsnprintf.Plo at am__quote@
+@@ -1524,6 +1535,12 @@
+ -rm -f vsnprintf_nonpic.c
+ $(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++libkdefakes_pic.a: libkdefakes.la
++ -rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++ cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
++ ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++ ranlib libkdefakes_pic.a
++
+ .PHONY: kckey_h parser
+ kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
+ (cd $(srcdir) && ./generate_keys.sh $(QNAMESPACE_H))
+@@ -1835,18 +1852,18 @@
+ mocs: ksock.moc
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ #>+ 3
+-kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
+- $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
++kprocess.moc: $(srcdir)/kprocess.h
++ $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
- mostlyclean-libtool:
-@@ -893,7 +940,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ #>+ 2
+-mocs: kglobalaccel_win.moc
++mocs: kprocess.moc
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ #>+ 3
+-kprocess.moc: $(srcdir)/kprocess.h
+- $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
++kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
++ $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1040,7 +1087,7 @@
- .NOEXPORT:
+ #>+ 2
+-mocs: kprocess.moc
++mocs: kglobalaccel_win.moc
+ #>+ 3
+ kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
+@@ -1884,18 +1901,18 @@
+ mocs: klibloader.moc
+
+ #>+ 3
+-ksycoca.moc: $(srcdir)/ksycoca.h
+- $(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
++kdesktopfile.moc: $(srcdir)/kdesktopfile.h
++ $(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
+
#>+ 2
--KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test8a.cpp.ref test_dpointer.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test9.kcfgc test7.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am
-+KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test_dpointer.h.ref test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg test8b.kcfg Makefile.in test8a.h.ref test_dpointer.kcfg test4.h.ref test_dpointer.kcfgc test1.kcfg test_dpointer.cpp.ref test8a.cpp.ref test3.h.ref test5.h.ref test1.h.ref test9.cpp.ref test8a.kcfg test8b.kcfgc test9.kcfg test4.kcfgc test3.kcfg test5.cpp.ref myprefs.h test1.cpp.ref test7.kcfg test2.cpp.ref test5.kcfg test3.kcfgc test7.kcfgc test9.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref kconfigcompiler_test.h test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am
+-mocs: ksycoca.moc
++mocs: kdesktopfile.moc
+ #>+ 3
+-kdesktopfile.moc: $(srcdir)/kdesktopfile.h
+- $(MOC) $(srcdir)/kdesktopfile.h -o kdesktopfile.moc
++ksycoca.moc: $(srcdir)/ksycoca.h
++ $(MOC) $(srcdir)/ksycoca.h -o ksycoca.moc
+
#>+ 2
- docs-am:
---- kdecore/malloc/Makefile.in
-+++ kdecore/malloc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+-mocs: kdesktopfile.moc
++mocs: ksycoca.moc
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,6 +37,8 @@
- # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- # Boston, MA 02110-1301, USA.
+ #>+ 3
+ kaccelprivate.moc: $(srcdir)/kaccelprivate.h
+@@ -1913,7 +1930,7 @@
-+SOURCES = $(libklmalloc_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -83,13 +85,16 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/malloc.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/malloc.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libklmalloc_la_SOURCES)
- DIST_SOURCES = $(libklmalloc_la_SOURCES)
-@@ -110,6 +115,8 @@
+ #>+ 3
+ clean-metasources:
+- -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kglobalaccel_win.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
++ -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
+
+ #>+ 2
+ KDE_DIST=README.kiosk standard_weak.nmcheck libkdecore_weak.nmcheck Makefile.in README.exec kglobalaccel_mac.h netsupp_win32.cpp libkdecore.nmcheck kappdcopiface.h DESIGN.iconloading kglobalaccel_win.cpp README.user_profiles Web.colors kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h Rainbow.colors kdebugrc 40.colors kdebug.areas kdebugdcopiface.h Royal.colors kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in
+@@ -1971,7 +1988,7 @@
+
+
+ #>+ 11
+-libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kconfigdialogmanager.moc kprocctrl.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
++libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp $(srcdir)/kqiodevicegzip_p.cpp $(srcdir)/ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kconfigdialogmanager.moc kprocctrl.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
+ @echo 'creating libkdecore_la.all_cpp.cpp ...'; \
+ rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
+--- kdecore/malloc/Makefile.in
++++ kdecore/malloc/Makefile.in
+@@ -110,6 +110,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -28982,7 +18723,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -151,8 +158,6 @@
+@@ -151,8 +153,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -28991,7 +18732,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -229,7 +234,6 @@
+@@ -229,7 +229,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -28999,7 +18740,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -266,6 +270,9 @@
+@@ -266,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -29009,7 +18750,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -321,6 +328,7 @@
+@@ -321,6 +323,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -29017,16 +18758,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -330,8 +338,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -349,6 +355,7 @@
+@@ -349,6 +352,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -29034,7 +18766,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -516,7 +523,7 @@
+@@ -516,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -29043,7 +18775,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +561,9 @@
+@@ -554,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29055,158 +18787,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -582,21 +589,24 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -707,7 +717,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdecore/network/Makefile.in
+++ kdecore/network/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libkdecorenetwork_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -79,32 +81,78 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbufferedsocket.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kclientsocketbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatagramsocket.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khttpproxysocketdevice.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolvermanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolverstandardworkers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolverworkerbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreverseresolver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kserversocket.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketaddress.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbuffer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketdevice.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksockssocketdevice.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksrvresolverworker.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstreamsocket.Plo
-+#>+ 34
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdecorenetwork_la.all_cpp.P ./$(DEPDIR)/kbufferedsocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kclientsocketbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatagramsocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khttpproxysocketdevice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvermanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverstandardworkers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverworkerbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreverseresolver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kserversocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketaddress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbuffer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketdevice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksockssocketdevice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksrvresolverworker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstreamsocket.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kbufferedsocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kclientsocketbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatagramsocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khttpproxysocketdevice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvermanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverstandardworkers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverworkerbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreverseresolver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kserversocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketaddress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbuffer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketdevice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksockssocketdevice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksrvresolverworker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstreamsocket.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdecorenetwork_la_SOURCES)
- DIST_SOURCES = $(libkdecorenetwork_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(includedir)"
- configDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(config_DATA)
-@@ -127,6 +175,8 @@
+@@ -127,6 +127,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -29215,7 +18798,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -168,8 +218,6 @@
+@@ -168,8 +170,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -29224,7 +18807,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -246,7 +294,6 @@
+@@ -246,7 +246,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -29232,7 +18815,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -283,6 +330,9 @@
+@@ -283,6 +282,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -29242,7 +18825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,6 +388,7 @@
+@@ -338,6 +340,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -29250,16 +18833,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -347,8 +398,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -366,6 +415,7 @@
+@@ -366,6 +369,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -29267,7 +18841,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -587,7 +637,7 @@
+@@ -587,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29276,7 +18850,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +675,9 @@
+@@ -625,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29288,80 +18862,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -669,21 +719,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -700,7 +753,7 @@
- test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
- @list='$(config_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
- $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
- done
-@@ -708,7 +761,7 @@
- uninstall-configDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(config_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
- rm -f "$(DESTDIR)$(configdir)/$$f"; \
- done
-@@ -717,7 +770,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -725,7 +778,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -831,7 +884,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -919,32 +972,32 @@
+@@ -919,32 +923,32 @@
mocs: ksrvresolverworker_p.moc
#>+ 3
@@ -29406,7 +18907,7 @@
#>+ 3
kresolver.moc: $(srcdir)/kresolver.h
-@@ -969,7 +1022,7 @@
+@@ -969,7 +973,7 @@
#>+ 3
clean-metasources:
@@ -29415,7 +18916,7 @@
#>+ 2
KDE_DIST=Makefile.in ipv6blacklist Makefile.am
-@@ -1057,8 +1110,8 @@
+@@ -1057,8 +1061,8 @@
ksrvresolverworker.o: ksrvresolverworker_p.moc
kbufferedsocket.o: kbufferedsocket.moc
kbufferedsocket.lo: kbufferedsocket.moc
@@ -29427,74 +18928,7 @@
kstreamsocket.lo: kstreamsocket.moc
--- kdecore/svgicons/Makefile.in
+++ kdecore/svgicons/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkdesvgicons_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -66,32 +68,33 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ksvgiconengine.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksvgiconpainter.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdesvgicons_la.all_cpp.P ./$(DEPDIR)/ksvgiconengine.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksvgiconpainter.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/ksvgiconengine.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksvgiconpainter.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdesvgicons_la_SOURCES)
- DIST_SOURCES = $(libkdesvgicons_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(includedir)"
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS)
-@@ -112,6 +115,8 @@
+@@ -112,6 +112,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -29503,7 +18937,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +158,6 @@
+@@ -153,8 +155,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -29512,7 +18946,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +234,6 @@
+@@ -231,7 +231,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -29520,7 +18954,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +270,9 @@
+@@ -268,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -29530,7 +18964,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +328,7 @@
+@@ -323,6 +325,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -29538,16 +18972,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +338,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -29555,7 +18980,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -517,7 +522,7 @@
+@@ -517,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29564,7 +18989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +560,9 @@
+@@ -555,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29576,225 +19001,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -584,21 +589,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -615,7 +623,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -623,7 +631,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -729,7 +737,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdecore/tests/Makefile.in
+++ kdecore/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,8 @@
- # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- # Boston, MA 02110-1301, USA.
-
-+SOURCES = $(kunittest_kconfig_la_SOURCES) $(cplusplustest_SOURCES) $(dcopkonqtest_SOURCES) $(kapptest_SOURCES) $(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) $(kcmdlineargstest_SOURCES) $(kconfigtestgui_SOURCES) $(kdebugtest_SOURCES) $(kglobaltest_SOURCES) $(kiconloadertest_SOURCES) $(kidlclienttest_SOURCES) $(kidlservertest_SOURCES) $(kipctest_SOURCES) $(klocaletest_SOURCES) $(kmacroexpandertest_SOURCES) $(kmdcodectest_SOURCES) $(kmemtest_SOURCES) $(knotifytest_SOURCES) $(kprocesstest_SOURCES) $(kprociotest_SOURCES) $(krandomsequencetest_SOURCES) $(kresolvertest_SOURCES) $(krfcdatetest_SOURCES) $(kshelltest_SOURCES) $(ksimpleconfigtest_SOURCES) $(ksocktest_SOURCES) $(ksortablevaluelisttest_SOURCES) $(kstdacceltest_SOURCES) $(kstddirstest_SOURCES) $(kstringhandlertest_SOURCES) $(ktempfiletest_SOURCES) $(ktimezonestest_SOURCES) $(kuniqueapptest_SOURCES) $(kurltest_SOURCES) $(kxerrorhandlertest_SOURCES) $(startserviceby_SOURCES) $(testqtargs_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -327,24 +329,133 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/KIDLTest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/KIDLTestClient.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cplusplustest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopkonqtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kapptest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendartest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharsetstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtest.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtestgui.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdebugtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobaltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconloadertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kipctest.Po ./$(DEPDIR)/klocaletest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpandertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodectest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmemtest.Po ./$(DEPDIR)/knotifytest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprocesstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprociotest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequencetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolvertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krfcdatetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshelltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfigtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocktest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksortablevaluelisttest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdacceltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstddirstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandlertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktempfiletest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonestest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapptest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandlertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/startserviceby.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testqtargs.Po
-+#>+ 72
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/KIDLTest_stub.P $(DEPDIR)/KIDLTest_skel.P $(DEPDIR)/kidlclienttest.all_cpp.P $(DEPDIR)/kidlservertest.all_cpp.P ./$(DEPDIR)/KIDLTest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/KIDLTestClient.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cplusplustest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopkonqtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapptest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendartest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsetstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtestgui.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobaltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloadertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kipctest.Po ./$(DEPDIR)/klocaletest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpandertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodectest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmemtest.Po ./$(DEPDIR)/knotifytest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocesstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprociotest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequencetest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krfcdatetest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshelltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfigtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocktest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksortablevaluelisttest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdacceltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstddirstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandlertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempfiletest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonestest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapptest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandlertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/startserviceby.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testqtargs.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/KIDLTest_stub.P $(DEPDIR)/KIDLTest_skel.P ./$(DEPDIR)/KIDLTest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/KIDLTestClient.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cplusplustest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopkonqtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapptest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendartest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsetstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtestgui.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobaltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloadertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kipctest.Po ./$(DEPDIR)/klocaletest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpandertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodectest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmemtest.Po ./$(DEPDIR)/knotifytest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocesstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprociotest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequencetest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krfcdatetest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshelltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfigtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocktest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksortablevaluelisttest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdacceltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstddirstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandlertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempfiletest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonestest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapptest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurltest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandlertest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/startserviceby.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testqtargs.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kunittest_kconfig_la_SOURCES) $(cplusplustest_SOURCES) \
- $(dcopkonqtest_SOURCES) $(kapptest_SOURCES) \
- $(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) \
-@@ -402,6 +513,8 @@
+@@ -402,6 +402,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -29803,7 +19012,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -443,8 +556,6 @@
+@@ -443,8 +445,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -29812,7 +19021,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -521,7 +632,6 @@
+@@ -521,7 +521,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -29820,7 +19029,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -558,6 +668,9 @@
+@@ -558,6 +557,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -29830,7 +19039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,6 +726,7 @@
+@@ -613,6 +615,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -29838,16 +19047,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -622,8 +736,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -641,6 +753,7 @@
+@@ -641,6 +644,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -29855,7 +19055,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -858,7 +971,7 @@
+@@ -858,7 +862,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29864,7 +19064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -896,9 +1009,9 @@
+@@ -896,9 +900,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29876,44 +19076,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
-@@ -1079,21 +1192,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -1279,7 +1395,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1360,18 +1476,18 @@
+@@ -1360,18 +1364,18 @@
.NOEXPORT:
#>+ 3
@@ -29938,7 +19101,7 @@
#>+ 3
kprociotest.moc: $(srcdir)/kprociotest.h
-@@ -1406,7 +1522,7 @@
+@@ -1406,7 +1410,7 @@
#>+ 3
clean-metasources:
@@ -29949,119 +19112,7 @@
KDE_DIST=Makefile.in kconfigtestgui.h Makefile.am
--- kded/Makefile.in
+++ kded/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,6 +37,10 @@
-
-
-
-+#>- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
-+#>+ 1
-+SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -77,16 +81,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_menudir)" \
-- "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_menudir)" "$(DESTDIR)$(includedir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -130,29 +125,60 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kde-menu.Po ./$(DEPDIR)/kded.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khostname.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/vfolder_menu.Plo
-+#>+ 22
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kded.la.Po $(DEPDIR)/kded_dummy.Plo $(DEPDIR)/kbuildsycoca.la.Po $(DEPDIR)/kbuildsycoca_dummy.Plo $(DEPDIR)/libkdeinit_kded_la.all_cpp.P $(DEPDIR)/libkdeinit_kbuildsycoca_la.all_cpp.P $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P ./$(DEPDIR)/kbuildimageiofactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-menu.Po ./$(DEPDIR)/kded.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khostname.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vfolder_menu.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kded.la.Po $(DEPDIR)/kded_dummy.Plo $(DEPDIR)/kbuildsycoca.la.Po $(DEPDIR)/kbuildsycoca_dummy.Plo ./$(DEPDIR)/kbuildimageiofactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-menu.Po ./$(DEPDIR)/kded.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khostname.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vfolder_menu.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
--#>- $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
-- $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES)
-+ $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
- #>- DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
- #>- $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
- #>+ 2
-@@ -181,6 +207,8 @@
+@@ -181,6 +181,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -30070,7 +19121,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -222,8 +250,6 @@
+@@ -222,8 +224,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -30079,7 +19130,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -300,7 +326,6 @@
+@@ -300,7 +300,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -30087,7 +19138,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -337,6 +362,9 @@
+@@ -337,6 +336,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -30097,7 +19148,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -392,6 +420,7 @@
+@@ -392,6 +394,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -30105,16 +19156,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +430,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -420,6 +447,7 @@
+@@ -420,6 +423,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -30122,7 +19164,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -622,7 +650,7 @@
+@@ -622,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30131,7 +19173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,16 +688,16 @@
+@@ -660,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30143,155 +19185,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -677,8 +705,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -696,7 +724,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -704,8 +732,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -780,21 +808,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -811,7 +842,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -819,7 +850,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -828,7 +859,7 @@
- test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
- @list='$(update_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
- $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -836,7 +867,7 @@
- uninstall-updateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(update_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -845,7 +876,7 @@
- test -z "$(xdg_menudir)" || $(mkdir_p) "$(DESTDIR)$(xdg_menudir)"
- @list='$(xdg_menu_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(xdg_menuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_menudir)/$$f'"; \
- $(xdg_menuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_menudir)/$$f"; \
- done
-@@ -853,7 +884,7 @@
- uninstall-xdg_menuDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(xdg_menu_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(xdg_menudir)/$$f'"; \
- rm -f "$(DESTDIR)$(xdg_menudir)/$$f"; \
- done
-@@ -862,7 +893,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -870,7 +901,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -979,7 +1010,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1216,18 +1247,18 @@
+@@ -1216,18 +1220,18 @@
kbuildsycoca_DEPENDENCIES = libkdeinit_kbuildsycoca.la
#>+ 3
@@ -30316,7 +19210,7 @@
#>+ 3
kdedmodule.moc: $(srcdir)/kdedmodule.h
-@@ -1245,7 +1276,7 @@
+@@ -1245,7 +1249,7 @@
#>+ 3
clean-metasources:
@@ -30327,79 +19221,7 @@
KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am
--- kded/test/Makefile.in
+++ kded/test/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
- # $Id: Makefile.am 334039 2004-07-30 03:27:07Z nhasan $
-
-
-+SOURCES = $(kded_test_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -77,24 +72,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/test.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/test_skel.P $(DEPDIR)/kded_test_la.all_cpp.P ./$(DEPDIR)/test.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/test_skel.P ./$(DEPDIR)/test.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_test_la_SOURCES)
- DIST_SOURCES = $(kded_test_la_SOURCES)
- servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -116,6 +115,8 @@
+@@ -116,6 +116,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -30408,7 +19230,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -157,8 +158,6 @@
+@@ -157,8 +159,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -30417,7 +19239,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -235,7 +234,6 @@
+@@ -235,7 +235,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -30425,7 +19247,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -272,6 +270,9 @@
+@@ -272,6 +271,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -30435,7 +19257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,6 +328,7 @@
+@@ -327,6 +329,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -30443,16 +19265,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -336,8 +338,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -355,6 +355,7 @@
+@@ -355,6 +358,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -30460,7 +19273,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -529,7 +530,7 @@
+@@ -529,7 +533,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30469,7 +19282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,16 +568,16 @@
+@@ -567,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30481,170 +19294,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -584,8 +585,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -613,21 +614,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -644,7 +648,7 @@
- test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
- @list='$(services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
- $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -652,7 +656,7 @@
- uninstall-servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -758,7 +762,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdefx/Makefile.in
+++ kdefx/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,6 +37,8 @@
- #SUBDIRS = . tests
-
-
-+SOURCES = $(libkdefx_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -75,12 +77,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -100,24 +96,46 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcpuinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdrawutil.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimageeffect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmap.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapeffect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapsplitter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstyle.Plo
-+#>+ 14
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdefx_la.all_cpp.P ./$(DEPDIR)/kcpuinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdrawutil.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageeffect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmap.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapeffect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapsplitter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstyle.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kcpuinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdrawutil.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageeffect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmap.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapeffect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapsplitter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstyle.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdefx_la_SOURCES)
- DIST_SOURCES = $(libkdefx_la_SOURCES)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -139,6 +157,8 @@
+@@ -139,6 +139,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -30653,7 +19305,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -180,8 +200,6 @@
+@@ -180,8 +182,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -30662,7 +19314,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -258,7 +276,6 @@
+@@ -258,7 +258,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -30670,7 +19322,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -295,6 +312,9 @@
+@@ -295,6 +294,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -30680,7 +19332,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -350,6 +370,7 @@
+@@ -350,6 +352,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -30688,16 +19340,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -359,8 +380,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -378,6 +397,7 @@
+@@ -378,6 +381,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -30705,7 +19348,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -560,7 +580,7 @@
+@@ -560,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30714,7 +19357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,16 +618,16 @@
+@@ -598,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30726,265 +19369,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -615,8 +635,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -656,21 +676,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -687,7 +710,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -695,7 +718,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -802,7 +825,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/Makefile.in
-+++ kdeprint/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -65,17 +67,7 @@
- #>- libdriverparse_a_OBJECTS = $(am_libdriverparse_a_OBJECTS)
- #>+ 1
- libdriverparse_a_OBJECTS = driverparse.$(OBJEXT)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(configdir)" "$(DESTDIR)$(printdatadir)" \
-- "$(DESTDIR)$(servicesdir)" "$(DESTDIR)$(uidatadir)" \
-- "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(includedir)" \
-- "$(DESTDIR)$(kdeprintdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(printdatadir)" "$(DESTDIR)$(servicesdir)" "$(DESTDIR)$(uidatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kdeprintdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -121,32 +113,133 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/driver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/driveritem.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/driverparse.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/driverview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/droptionview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/foomatic2loader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/fooparser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/fooscanner.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintcheck.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintd.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilelist.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdbentry.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfactory.Plo ./$(DEPDIR)/kmjob.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmjobmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmprinter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmthreadjob.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmuimanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmvirtualmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpcopiespage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpdriverpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpfileselectpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpfilterpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpgeneralpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpipeprocess.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpmarginpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpposterpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpqtpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreloadobject.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialogpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprinter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprinterpropertydialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintpreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintprocess.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommand.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/marginpreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/marginvaluewidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/marginwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/messagewindow.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugincombobox.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/posterpreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ppdloader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ppdparser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ppdscanner.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/printerfilter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/treecombobox.Plo ./$(DEPDIR)/util.Plo
-+#>+ 50
-+ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kdeprintd_skel.P $(DEPDIR)/kmfactory_skel.P ./$(DEPDIR)/driver.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/driveritem.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/driverparse.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/driverview.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/droptionview.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/foomatic2loader.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fooparser.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fooscanner.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintcheck.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintd.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilelist.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdbentry.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfactory.Plo ./$(DEPDIR)/kmjob.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmjobmanager.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmmanager.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmprinter.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialmanager.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmthreadjob.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmuimanager.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmvirtualmanager.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpcopiespage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpdriverpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpfileselectpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpfilterpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpgeneralpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpipeprocess.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpmarginpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpposterpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpqtpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreloadobject.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintaction.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialog.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialogpage.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprinter.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprinterimpl.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprinterpropertydialog.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintpreview.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintprocess.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommand.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/marginpreview.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/marginvaluewidget.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/marginwidget.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/messagewindow.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugincombobox.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/posterpreview.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ppdloader.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ppdparser.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ppdscanner.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printerfilter.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/treecombobox.Plo ./$(DEPDIR)/util.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) \
- $(libkdeprint_la_SOURCES)
- DIST_SOURCES = $(libdriverparse_a_SOURCES) \
-@@ -193,6 +286,8 @@
+--- kdeprint/cups/cupsdconf2/Makefile.in
++++ kdeprint/cups/cupsdconf2/Makefile.in
+@@ -148,6 +148,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -30993,7 +19380,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -234,8 +329,6 @@
+@@ -189,8 +191,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -31002,7 +19389,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -312,7 +405,6 @@
+@@ -267,7 +267,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -31010,7 +19397,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -349,6 +441,9 @@
+@@ -304,6 +303,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -31020,7 +19407,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,6 +499,7 @@
+@@ -359,6 +361,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -31028,16 +19415,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +509,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -432,6 +526,7 @@
+@@ -387,6 +390,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -31045,16 +19423,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -677,7 +772,7 @@
+@@ -581,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .c .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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -715,9 +810,9 @@
+@@ -619,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31064,633 +19442,59 @@
-$(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)
+@@ -1104,22 +1108,22 @@
+ mocs: cupsdnetworkpage.moc
- clean-noinstLIBRARIES:
-@@ -731,7 +826,7 @@
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -739,8 +834,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -758,7 +853,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -766,8 +861,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -851,42 +946,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -903,7 +1004,7 @@
- test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
- @list='$(config_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
- $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
- done
-@@ -911,7 +1012,7 @@
- uninstall-configDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(config_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
- rm -f "$(DESTDIR)$(configdir)/$$f"; \
- done
-@@ -920,7 +1021,7 @@
- test -z "$(printdatadir)" || $(mkdir_p) "$(DESTDIR)$(printdatadir)"
- @list='$(printdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(printdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(printdatadir)/$$f'"; \
- $(printdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(printdatadir)/$$f"; \
- done
-@@ -928,7 +1029,7 @@
- uninstall-printdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(printdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(printdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(printdatadir)/$$f"; \
- done
-@@ -937,7 +1038,7 @@
- test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
- @list='$(services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
- $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -945,7 +1046,7 @@
- uninstall-servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -954,7 +1055,7 @@
- test -z "$(uidatadir)" || $(mkdir_p) "$(DESTDIR)$(uidatadir)"
- @list='$(uidata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(uidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidatadir)/$$f'"; \
- $(uidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidatadir)/$$f"; \
- done
-@@ -962,7 +1063,7 @@
- uninstall-uidataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(uidata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(uidatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(uidatadir)/$$f"; \
- done
-@@ -971,7 +1072,7 @@
- test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
- @list='$(update_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
- $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -979,7 +1080,7 @@
- uninstall-updateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(update_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -988,7 +1089,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -996,7 +1097,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -1005,7 +1106,7 @@
- test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
- @list='$(kdeprint_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdeprintHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprintdir)/$$f'"; \
- $(kdeprintHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprintdir)/$$f"; \
- done
-@@ -1013,7 +1114,7 @@
- uninstall-kdeprintHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kdeprint_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdeprintdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdeprintdir)/$$f"; \
- done
-@@ -1025,13 +1126,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1043,7 +1138,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1051,13 +1146,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1078,7 +1167,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1181,14 +1270,12 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1220,7 +1307,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1471,13 +1558,6 @@
-
-
#>+ 3
--kprintdialog.moc: $(srcdir)/kprintdialog.h
-- $(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
--
--#>+ 2
--mocs: kprintdialog.moc
--
--#>+ 3
- posterpreview.moc: $(srcdir)/posterpreview.h
- $(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
+-cupsddialog.moc: $(srcdir)/cupsddialog.h
+- $(MOC) $(srcdir)/cupsddialog.h -o cupsddialog.moc
++cupsdbrowsingpage.moc: $(srcdir)/cupsdbrowsingpage.h
++ $(MOC) $(srcdir)/cupsdbrowsingpage.h -o cupsdbrowsingpage.moc
-@@ -1485,11 +1565,11 @@
- mocs: posterpreview.moc
-
- #>+ 3
--kpposterpage.moc: $(srcdir)/kpposterpage.h
-- $(MOC) $(srcdir)/kpposterpage.h -o kpposterpage.moc
-+kprintdialog.moc: $(srcdir)/kprintdialog.h
-+ $(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
-
#>+ 2
--mocs: kpposterpage.moc
-+mocs: kprintdialog.moc
+-mocs: cupsddialog.moc
++mocs: cupsdbrowsingpage.moc
#>+ 3
- marginpreview.moc: $(srcdir)/marginpreview.h
-@@ -1499,6 +1579,13 @@
- mocs: marginpreview.moc
+-cupsdbrowsingpage.moc: $(srcdir)/cupsdbrowsingpage.h
+- $(MOC) $(srcdir)/cupsdbrowsingpage.h -o cupsdbrowsingpage.moc
++cupsddialog.moc: $(srcdir)/cupsddialog.h
++ $(MOC) $(srcdir)/cupsddialog.h -o cupsddialog.moc
- #>+ 3
-+kpposterpage.moc: $(srcdir)/kpposterpage.h
-+ $(MOC) $(srcdir)/kpposterpage.h -o kpposterpage.moc
-+
-+#>+ 2
-+mocs: kpposterpage.moc
-+
-+#>+ 3
- kmjobmanager.moc: $(srcdir)/kmjobmanager.h
- $(MOC) $(srcdir)/kmjobmanager.h -o kmjobmanager.moc
-
-@@ -1527,11 +1614,11 @@
- mocs: plugincombobox.moc
-
- #>+ 3
--kdeprintd.moc: $(srcdir)/kdeprintd.h
-- $(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
-+driverview.moc: $(srcdir)/driverview.h
-+ $(MOC) $(srcdir)/driverview.h -o driverview.moc
-
#>+ 2
--mocs: kdeprintd.moc
-+mocs: driverview.moc
+-mocs: cupsdbrowsingpage.moc
++mocs: cupsddialog.moc
#>+ 3
- kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
-@@ -1541,11 +1628,11 @@
- mocs: kpgeneralpage.moc
+ clean-metasources:
+- -rm -f cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
++ -rm -f cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
- #>+ 3
--driverview.moc: $(srcdir)/driverview.h
-- $(MOC) $(srcdir)/driverview.h -o driverview.moc
-+kdeprintd.moc: $(srcdir)/kdeprintd.h
-+ $(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
-
#>+ 2
--mocs: driverview.moc
-+mocs: kdeprintd.moc
+ KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cupsdcomment.pl cups_logo.png Makefile.am
+@@ -1166,7 +1170,7 @@
- #>+ 3
- kpfilterpage.moc: $(srcdir)/kpfilterpage.h
-@@ -1555,18 +1642,18 @@
- mocs: kpfilterpage.moc
- #>+ 3
--kprinterpropertydialog.moc: $(srcdir)/kprinterpropertydialog.h
-- $(MOC) $(srcdir)/kprinterpropertydialog.h -o kprinterpropertydialog.moc
-+kmfactory.moc: $(srcdir)/kmfactory.h
-+ $(MOC) $(srcdir)/kmfactory.h -o kmfactory.moc
+ #>+ 11
+-libkdeinit_cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
++libkdeinit_cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
+ @echo 'creating libkdeinit_cupsdconf_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_cupsdconf_la.all_cpp.files libkdeinit_cupsdconf_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_cupsdconf_la.all_cpp.final; \
+@@ -1178,7 +1182,7 @@
+ rm -f libkdeinit_cupsdconf_la.all_cpp.final libkdeinit_cupsdconf_la.all_cpp.files
- #>+ 2
--mocs: kprinterpropertydialog.moc
-+mocs: kmfactory.moc
-
- #>+ 3
--kmfactory.moc: $(srcdir)/kmfactory.h
-- $(MOC) $(srcdir)/kmfactory.h -o kmfactory.moc
-+kprinterpropertydialog.moc: $(srcdir)/kprinterpropertydialog.h
-+ $(MOC) $(srcdir)/kprinterpropertydialog.h -o kprinterpropertydialog.moc
-
- #>+ 2
--mocs: kmfactory.moc
-+mocs: kprinterpropertydialog.moc
-
- #>+ 3
- kprintprocess.moc: $(srcdir)/kprintprocess.h
-@@ -1583,18 +1670,18 @@
- mocs: kfilelist.moc
-
- #>+ 3
--marginwidget.moc: $(srcdir)/marginwidget.h
-- $(MOC) $(srcdir)/marginwidget.h -o marginwidget.moc
-+droptionview.moc: $(srcdir)/droptionview.h
-+ $(MOC) $(srcdir)/droptionview.h -o droptionview.moc
-
- #>+ 2
--mocs: marginwidget.moc
-+mocs: droptionview.moc
-
- #>+ 3
--droptionview.moc: $(srcdir)/droptionview.h
-- $(MOC) $(srcdir)/droptionview.h -o droptionview.moc
-+marginwidget.moc: $(srcdir)/marginwidget.h
-+ $(MOC) $(srcdir)/marginwidget.h -o marginwidget.moc
-
- #>+ 2
--mocs: droptionview.moc
-+mocs: marginwidget.moc
-
- #>+ 3
- kprinterimpl.moc: $(srcdir)/kprinterimpl.h
-@@ -1632,18 +1719,18 @@
- mocs: kmuimanager.moc
-
- #>+ 3
--marginvaluewidget.moc: $(srcdir)/marginvaluewidget.h
-- $(MOC) $(srcdir)/marginvaluewidget.h -o marginvaluewidget.moc
-+kmmanager.moc: $(srcdir)/kmmanager.h
-+ $(MOC) $(srcdir)/kmmanager.h -o kmmanager.moc
-
- #>+ 2
--mocs: marginvaluewidget.moc
-+mocs: kmmanager.moc
-
- #>+ 3
--kmmanager.moc: $(srcdir)/kmmanager.h
-- $(MOC) $(srcdir)/kmmanager.h -o kmmanager.moc
-+marginvaluewidget.moc: $(srcdir)/marginvaluewidget.h
-+ $(MOC) $(srcdir)/marginvaluewidget.h -o marginvaluewidget.moc
-
- #>+ 2
--mocs: kmmanager.moc
-+mocs: marginvaluewidget.moc
-
- #>+ 3
- kprintaction.moc: $(srcdir)/kprintaction.h
-@@ -1654,7 +1741,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kprintdialog.moc posterpreview.moc kpposterpage.moc marginpreview.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc kdeprintd.moc kpgeneralpage.moc driverview.moc kpfilterpage.moc kprinterpropertydialog.moc kmfactory.moc kprintprocess.moc kfilelist.moc marginwidget.moc droptionview.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc marginvaluewidget.moc kmmanager.moc kprintaction.moc
-+ -rm -f posterpreview.moc kprintdialog.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc driverview.moc kpgeneralpage.moc kdeprintd.moc kpfilterpage.moc kmfactory.moc kprinterpropertydialog.moc kprintprocess.moc kfilelist.moc droptionview.moc marginwidget.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc kmmanager.moc marginvaluewidget.moc kprintaction.moc
-
- #>+ 2
- KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am
+ #>+ 11
+-cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
++cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
+ @echo 'creating cupsdconf_la.all_cpp.cpp ...'; \
+ rm -f cupsdconf_la.all_cpp.files cupsdconf_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> cupsdconf_la.all_cpp.final; \
--- kdeprint/cups/Makefile.in
+++ kdeprint/cups/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) $(make_driver_db_cups_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -113,32 +108,123 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cupsaddsmb2.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdoprint.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsinfos.Plo ./$(DEPDIR)/image.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/imageposition.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ippreportdlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ipprequest.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcupsprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcups.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcupsdir.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsconfigwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsjobmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsuimanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbanners.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropquota.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropusers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwbanners.Plo ./$(DEPDIR)/kmwfax.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwipp.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwippprinter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwippselect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwother.Plo ./$(DEPDIR)/kmwquota.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwusers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kphpgl2page.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpimagepage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpschedulepage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kptagspage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kptextpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_cups.Po
-+#>+ 60
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_cups_la.all_cpp.P ./$(DEPDIR)/cupsaddsmb2.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdoprint.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsinfos.Plo ./$(DEPDIR)/image.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageposition.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ippreportdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ipprequest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcupsprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcups.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcupsdir.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsconfigwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsjobmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsuimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbanners.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropquota.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropusers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwbanners.Plo ./$(DEPDIR)/kmwfax.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwipp.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippprinter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippselect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwother.Plo ./$(DEPDIR)/kmwquota.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwusers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kphpgl2page.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpimagepage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpschedulepage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptagspage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptextpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_cups.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/cupsaddsmb2.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdoprint.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsinfos.Plo ./$(DEPDIR)/image.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageposition.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ippreportdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ipprequest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcupsprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcups.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcupsdir.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsconfigwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsjobmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsuimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbanners.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropquota.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropusers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwbanners.Plo ./$(DEPDIR)/kmwfax.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwipp.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippprinter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippselect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwother.Plo ./$(DEPDIR)/kmwquota.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwusers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kphpgl2page.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpimagepage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpschedulepage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptagspage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptextpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_cups.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
- $(make_driver_db_cups_SOURCES)
- DIST_SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
-@@ -178,6 +264,8 @@
+@@ -178,6 +178,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -31699,7 +19503,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -219,8 +307,6 @@
+@@ -219,8 +221,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -31708,7 +19512,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -297,7 +383,6 @@
+@@ -297,7 +297,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -31716,7 +19520,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -334,6 +419,9 @@
+@@ -334,6 +333,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -31726,7 +19530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -389,6 +477,7 @@
+@@ -389,6 +391,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -31734,16 +19538,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -398,8 +487,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -417,6 +504,7 @@
+@@ -417,6 +420,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -31751,7 +19546,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -615,7 +703,7 @@
+@@ -615,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -31760,7 +19555,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,16 +741,16 @@
+@@ -653,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31772,196 +19567,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -670,8 +758,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -768,42 +856,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -820,7 +914,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -828,7 +922,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -837,7 +931,7 @@
- test -z "$(miscdir)" || $(mkdir_p) "$(DESTDIR)$(miscdir)"
- @list='$(misc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(miscDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(miscdir)/$$f'"; \
- $(miscDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(miscdir)/$$f"; \
- done
-@@ -845,7 +939,7 @@
- uninstall-miscDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(misc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(miscdir)/$$f'"; \
- rm -f "$(DESTDIR)$(miscdir)/$$f"; \
- done
-@@ -857,13 +951,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -875,7 +963,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -883,13 +971,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -910,7 +992,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1009,17 +1091,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1051,7 +1131,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1180,18 +1260,18 @@
+@@ -1180,18 +1184,18 @@
mocs: kpimagepage.moc
#>+ 3
@@ -31986,7 +19592,7 @@
#>+ 3
kmwippprinter.moc: $(srcdir)/kmwippprinter.h
-@@ -1237,7 +1317,7 @@
+@@ -1237,7 +1241,7 @@
#>+ 3
clean-metasources:
@@ -31995,7 +19601,7 @@
#>+ 2
KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am
-@@ -1288,7 +1368,7 @@
+@@ -1288,7 +1292,7 @@
#>+ 11
@@ -32004,160 +19610,9 @@
@echo 'creating kdeprint_cups_la.all_cpp.cpp ...'; \
rm -f kdeprint_cups_la.all_cpp.files kdeprint_cups_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kdeprint_cups_la.all_cpp.final; \
---- kdeprint/cups/cupsdconf2/Makefile.in
-+++ kdeprint/cups/cupsdconf2/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -20,6 +20,10 @@
-
-
-
-+#>- SOURCES = $(cupsdconf_la_SOURCES)
-+#>+ 1
-+SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -59,14 +63,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdconfdatadir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdconfdatadir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -96,35 +93,100 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/addressdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/browsedialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cups-util.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdbrowsingpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdcomment.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdconf.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsddialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsddirpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdfilterpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdjobspage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdlogpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdnetworkpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsecuritypage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdserverpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsplash.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/editlist.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/locationdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/portdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/qdirlineedit.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/qdirmultilineedit.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sizewidget.Plo
-+#>+ 44
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/cupsdconf.la.Po $(DEPDIR)/cupsdconf_dummy.Plo $(DEPDIR)/libkdeinit_cupsdconf_la.all_cpp.P $(DEPDIR)/cupsdconf_la.all_cpp.P ./$(DEPDIR)/addressdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/browsedialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cups-util.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdbrowsingpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdcomment.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdconf.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddirpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdfilterpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdjobspage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdlogpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdnetworkpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsecuritypage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdserverpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsplash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editlist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/locationdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/portdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirlineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirmultilineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sizewidget.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/cupsdconf.la.Po $(DEPDIR)/cupsdconf_dummy.Plo ./$(DEPDIR)/addressdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/browsedialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cups-util.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdbrowsingpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdcomment.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdconf.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddirpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdfilterpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdjobspage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdlogpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdnetworkpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsecuritypage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdserverpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsplash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editlist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/locationdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/portdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirlineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirmultilineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sizewidget.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(cupsdconf_la_SOURCES)
--#>+ 1
--SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES)
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(cupsdconf_la_SOURCES)
- #>- DIST_SOURCES = $(cupsdconf_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES)
-@@ -148,6 +210,8 @@
+--- kdeprint/ext/Makefile.in
++++ kdeprint/ext/Makefile.in
+@@ -118,6 +118,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -32166,7 +19621,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -189,8 +253,6 @@
+@@ -159,8 +161,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -32175,7 +19630,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -267,7 +329,6 @@
+@@ -237,7 +237,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -32183,7 +19638,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -304,6 +365,9 @@
+@@ -274,6 +273,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -32193,7 +19648,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,6 +423,7 @@
+@@ -329,6 +331,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -32201,16 +19656,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,8 +433,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -387,6 +450,7 @@
+@@ -357,6 +360,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -32218,16 +19664,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -581,7 +645,7 @@
+@@ -531,7 +535,7 @@
.SUFFIXES:
- .SUFFIXES: .c .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*) \
-@@ -619,16 +683,16 @@
+@@ -569,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32237,258 +19683,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -636,8 +700,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -655,7 +719,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -663,8 +727,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -742,42 +806,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -794,7 +864,7 @@
- test -z "$(cupsdconfdatadir)" || $(mkdir_p) "$(DESTDIR)$(cupsdconfdatadir)"
- @list='$(cupsdconfdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(cupsdconfdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cupsdconfdatadir)/$$f'"; \
- $(cupsdconfdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cupsdconfdatadir)/$$f"; \
- done
-@@ -802,7 +872,7 @@
- uninstall-cupsdconfdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(cupsdconfdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(cupsdconfdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(cupsdconfdatadir)/$$f"; \
- done
-@@ -910,7 +980,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1104,22 +1174,22 @@
- mocs: cupsdnetworkpage.moc
-
- #>+ 3
--cupsddialog.moc: $(srcdir)/cupsddialog.h
-- $(MOC) $(srcdir)/cupsddialog.h -o cupsddialog.moc
-+cupsdbrowsingpage.moc: $(srcdir)/cupsdbrowsingpage.h
-+ $(MOC) $(srcdir)/cupsdbrowsingpage.h -o cupsdbrowsingpage.moc
-
- #>+ 2
--mocs: cupsddialog.moc
-+mocs: cupsdbrowsingpage.moc
-
- #>+ 3
--cupsdbrowsingpage.moc: $(srcdir)/cupsdbrowsingpage.h
-- $(MOC) $(srcdir)/cupsdbrowsingpage.h -o cupsdbrowsingpage.moc
-+cupsddialog.moc: $(srcdir)/cupsddialog.h
-+ $(MOC) $(srcdir)/cupsddialog.h -o cupsddialog.moc
-
- #>+ 2
--mocs: cupsdbrowsingpage.moc
-+mocs: cupsddialog.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
-+ -rm -f cupsdpage.moc cupsdsecuritypage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
-
- #>+ 2
- KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cupsdcomment.pl cups_logo.png Makefile.am
-@@ -1166,7 +1236,7 @@
-
-
- #>+ 11
--libkdeinit_cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
-+libkdeinit_cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
- @echo 'creating libkdeinit_cupsdconf_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_cupsdconf_la.all_cpp.files libkdeinit_cupsdconf_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_cupsdconf_la.all_cpp.final; \
-@@ -1178,7 +1248,7 @@
- rm -f libkdeinit_cupsdconf_la.all_cpp.final libkdeinit_cupsdconf_la.all_cpp.files
-
- #>+ 11
--cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsdbrowsingpage.moc cupsddialog.moc
-+cupsdconf_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsdconf.cpp $(srcdir)/cupsddialog.cpp $(srcdir)/cupsdpage.cpp $(srcdir)/cupsdcomment.cpp $(srcdir)/cupsdsplash.cpp $(srcdir)/cupsdserverpage.cpp $(srcdir)/cupsdlogpage.cpp $(srcdir)/cupsdjobspage.cpp $(srcdir)/cupsdfilterpage.cpp $(srcdir)/qdirlineedit.cpp $(srcdir)/cupsddirpage.cpp $(srcdir)/portdialog.cpp $(srcdir)/cupsdnetworkpage.cpp $(srcdir)/editlist.cpp $(srcdir)/cupsdbrowsingpage.cpp $(srcdir)/browsedialog.cpp $(srcdir)/cupsdsecuritypage.cpp $(srcdir)/locationdialog.cpp $(srcdir)/addressdialog.cpp $(srcdir)/qdirmultilineedit.cpp $(srcdir)/sizewidget.cpp $(srcdir)/main.cpp cupsdsecuritypage.moc cupsdpage.moc editlist.moc browsedialog.moc qdirmultilineedit.moc cupsdjobspage.moc qdirlineedit.moc locationdialog.moc cupsdserverpage.moc cupsdnetworkpage.moc cupsddialog.moc cupsdbrowsingpage.moc
- @echo 'creating cupsdconf_la.all_cpp.cpp ...'; \
- rm -f cupsdconf_la.all_cpp.files cupsdconf_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> cupsdconf_la.all_cpp.final; \
---- kdeprint/ext/Makefile.in
-+++ kdeprint/ext/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kdeprint_ext_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,12 +57,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -78,24 +74,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kextprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmextfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmextmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmextuimanager.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_ext_la.all_cpp.P ./$(DEPDIR)/kextprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextuimanager.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kextprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextuimanager.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_ext_la_SOURCES)
- DIST_SOURCES = $(kdeprint_ext_la_SOURCES)
- entryDATA_INSTALL = $(INSTALL_DATA)
-@@ -118,6 +127,8 @@
+--- kdeprint/filters/Makefile.in
++++ kdeprint/filters/Makefile.in
+@@ -81,6 +81,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -32497,7 +19696,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -159,8 +170,6 @@
+@@ -122,8 +124,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -32506,7 +19705,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -237,7 +246,6 @@
+@@ -200,7 +200,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -32514,7 +19713,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -274,6 +282,9 @@
+@@ -237,6 +236,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -32524,7 +19723,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,6 +340,7 @@
+@@ -292,6 +294,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -32532,16 +19731,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,8 +350,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -357,6 +367,7 @@
+@@ -320,6 +323,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -32549,16 +19739,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -531,7 +542,7 @@
+@@ -494,7 +498,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*) \
-@@ -569,16 +580,16 @@
+@@ -532,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32568,110 +19758,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -586,8 +597,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -621,21 +632,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -652,7 +666,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -660,7 +674,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -766,7 +780,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/filters/Makefile.in
-+++ kdeprint/filters/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -58,12 +58,6 @@
- SCRIPTS = $(bin_SCRIPTS)
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- filtersDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(filters_DATA)
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -81,6 +75,8 @@
+--- kdeprint/foomatic/Makefile.in
++++ kdeprint/foomatic/Makefile.in
+@@ -140,6 +140,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -32680,7 +19771,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -122,8 +118,6 @@
+@@ -181,8 +183,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -32689,7 +19780,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -200,7 +194,6 @@
+@@ -259,7 +259,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -32697,7 +19788,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -237,6 +230,9 @@
+@@ -296,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -32707,7 +19798,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -292,6 +288,7 @@
+@@ -351,6 +353,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -32715,16 +19806,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -301,8 +298,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -320,6 +315,7 @@
+@@ -379,6 +382,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -32732,16 +19814,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -494,7 +490,7 @@
- all: docs-am all-am
+@@ -558,7 +562,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +528,9 @@
+@@ -596,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32751,129 +19833,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binSCRIPTS: $(bin_SCRIPTS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -570,7 +566,7 @@
- test -z "$(filtersdir)" || $(mkdir_p) "$(DESTDIR)$(filtersdir)"
- @list='$(filters_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(filtersDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(filtersdir)/$$f'"; \
- $(filtersDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(filtersdir)/$$f"; \
- done
-@@ -578,7 +574,7 @@
- uninstall-filtersDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(filters_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(filtersdir)/$$f'"; \
- rm -f "$(DESTDIR)$(filtersdir)/$$f"; \
- done
-@@ -642,7 +638,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/foomatic/Makefile.in
-+++ kdeprint/foomatic/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(kdeprint_foomatic_la_SOURCES) $(make_driver_db_foomatic_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(entrydir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kdeprint_foomatic_la_DEPENDENCIES = \
-@@ -90,32 +85,45 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kfoomaticprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_foomatic.Po
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_foomatic_la.all_cpp.P ./$(DEPDIR)/kfoomaticprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_foomatic.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kfoomaticprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_foomatic.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_foomatic_la_SOURCES) \
- $(make_driver_db_foomatic_SOURCES)
- DIST_SOURCES = $(kdeprint_foomatic_la_SOURCES) \
-@@ -140,6 +148,8 @@
+--- kdeprint/lpd/Makefile.in
++++ kdeprint/lpd/Makefile.in
+@@ -138,6 +138,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -32882,7 +19846,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -181,8 +191,6 @@
+@@ -179,8 +181,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -32891,7 +19855,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -259,7 +267,6 @@
+@@ -257,7 +257,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -32899,7 +19863,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -296,6 +303,9 @@
+@@ -294,6 +293,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -32909,7 +19873,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -351,6 +361,7 @@
+@@ -349,6 +351,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -32917,16 +19881,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,8 +371,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -379,6 +388,7 @@
+@@ -377,6 +380,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -32934,7 +19889,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -558,7 +568,7 @@
+@@ -554,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -32943,7 +19898,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,16 +606,16 @@
+@@ -592,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32955,210 +19910,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -613,8 +623,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -679,42 +689,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -731,7 +747,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -739,7 +755,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -845,7 +861,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/lpd/Makefile.in
-+++ kdeprint/lpd/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(entrydir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kdeprint_lpd_la_DEPENDENCIES = \
-@@ -89,32 +84,54 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gschecker.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klpdprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpduimanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lpdtools.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpd.Po
-+#>+ 14
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_lpd_la.all_cpp.P ./$(DEPDIR)/gschecker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klpdprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpduimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpdtools.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpd.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/gschecker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klpdprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpduimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpdtools.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpd.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
- DIST_SOURCES = $(kdeprint_lpd_la_SOURCES) \
- $(make_driver_db_lpd_SOURCES)
-@@ -138,6 +155,8 @@
+--- kdeprint/lpdunix/Makefile.in
++++ kdeprint/lpdunix/Makefile.in
+@@ -120,6 +120,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -33167,7 +19921,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -179,8 +198,6 @@
+@@ -161,8 +163,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -33176,7 +19930,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -257,7 +274,6 @@
+@@ -239,7 +239,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -33184,7 +19938,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -294,6 +310,9 @@
+@@ -276,6 +275,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -33194,7 +19948,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,6 +368,7 @@
+@@ -331,6 +333,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -33202,16 +19956,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -358,8 +378,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -377,6 +395,7 @@
+@@ -359,6 +362,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -33219,16 +19964,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -554,7 +573,7 @@
+@@ -533,7 +537,7 @@
.SUFFIXES:
- .SUFFIXES: .c .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*) \
-@@ -592,16 +611,16 @@
+@@ -571,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33240,188 +19985,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -609,8 +628,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -678,42 +697,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -730,7 +755,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -738,7 +763,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -844,7 +869,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/lpdunix/Makefile.in
-+++ kdeprint/lpdunix/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kdeprint_lpdunix_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,12 +57,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -80,24 +76,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/klpdunixprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixuimanager.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_lpdunix_la.all_cpp.P ./$(DEPDIR)/klpdunixprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixuimanager.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/klpdunixprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixuimanager.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_lpdunix_la_SOURCES)
- DIST_SOURCES = $(kdeprint_lpdunix_la_SOURCES)
- entryDATA_INSTALL = $(INSTALL_DATA)
-@@ -120,6 +129,8 @@
+--- kdeprint/lpr/Makefile.in
++++ kdeprint/lpr/Makefile.in
+@@ -152,6 +152,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -33430,7 +19996,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -161,8 +172,6 @@
+@@ -193,8 +195,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -33439,7 +20005,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -239,7 +248,6 @@
+@@ -271,7 +271,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -33447,7 +20013,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -276,6 +284,9 @@
+@@ -308,6 +307,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -33457,7 +20023,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -331,6 +342,7 @@
+@@ -363,6 +365,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -33465,16 +20031,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -340,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -359,6 +369,7 @@
+@@ -391,6 +394,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -33482,16 +20039,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -533,7 +544,7 @@
+@@ -587,7 +591,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,16 +582,16 @@
+@@ -625,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33503,217 +20060,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -588,8 +599,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -623,21 +634,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -654,7 +668,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -662,7 +676,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -768,7 +782,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/lpr/Makefile.in
-+++ kdeprint/lpr/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,15 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdatadir)" \
-- "$(DESTDIR)$(kdeprintlprdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdatadir)" "$(DESTDIR)$(kdeprintlprdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kdeprint_lpr_la_DEPENDENCIES = \
-@@ -101,32 +95,87 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/apshandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/editentrydialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klprfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klprprinterimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiglpr.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlprjobmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlprmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpruimanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lpchelper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lpqhelper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lprhandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lprngtoolhandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lprsettings.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpr.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/matichandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/matichelper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/printcapentry.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/printcapreader.Plo
-+#>+ 36
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_lpr_la.all_cpp.P ./$(DEPDIR)/apshandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editentrydialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiglpr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprjobmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpruimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpchelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpqhelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprngtoolhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpr.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapentry.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapreader.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/apshandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editentrydialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprprinterimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiglpr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprjobmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpruimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpchelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpqhelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprngtoolhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpr.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapentry.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapreader.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
- DIST_SOURCES = $(kdeprint_lpr_la_SOURCES) \
- $(make_driver_db_lpr_SOURCES)
-@@ -152,6 +201,8 @@
+--- kdeprint/Makefile.in
++++ kdeprint/Makefile.in
+@@ -193,6 +193,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -33722,7 +20071,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -193,8 +244,6 @@
+@@ -234,8 +236,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -33731,7 +20080,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -271,7 +320,6 @@
+@@ -312,7 +312,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -33739,7 +20088,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -308,6 +356,9 @@
+@@ -349,6 +348,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -33749,7 +20098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -363,6 +414,7 @@
+@@ -404,6 +406,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -33757,16 +20106,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -372,8 +424,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -391,6 +441,7 @@
+@@ -432,6 +435,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -33774,16 +20114,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -587,7 +638,7 @@
+@@ -677,7 +681,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(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*) \
-@@ -625,16 +676,16 @@
+@@ -715,9 +719,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33793,382 +20133,168 @@
-$(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)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -642,8 +693,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -722,42 +773,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ clean-noinstLIBRARIES:
+@@ -1471,13 +1475,6 @@
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ #>+ 3
+-kprintdialog.moc: $(srcdir)/kprintdialog.h
+- $(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
+-
+-#>+ 2
+-mocs: kprintdialog.moc
+-
+-#>+ 3
+ posterpreview.moc: $(srcdir)/posterpreview.h
+ $(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+@@ -1485,11 +1482,11 @@
+ mocs: posterpreview.moc
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ #>+ 3
+-kpposterpage.moc: $(srcdir)/kpposterpage.h
+- $(MOC) $(srcdir)/kpposterpage.h -o kpposterpage.moc
++kprintdialog.moc: $(srcdir)/kprintdialog.h
++ $(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ #>+ 2
+-mocs: kpposterpage.moc
++mocs: kprintdialog.moc
- mostlyclean-libtool:
-@@ -774,7 +831,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -782,7 +839,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -791,7 +848,7 @@
- test -z "$(miscdatadir)" || $(mkdir_p) "$(DESTDIR)$(miscdatadir)"
- @list='$(miscdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(miscdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(miscdatadir)/$$f'"; \
- $(miscdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(miscdatadir)/$$f"; \
- done
-@@ -799,7 +856,7 @@
- uninstall-miscdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(miscdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(miscdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(miscdatadir)/$$f"; \
- done
-@@ -808,7 +865,7 @@
- test -z "$(kdeprintlprdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintlprdir)"
- @list='$(kdeprintlpr_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdeprintlprHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprintlprdir)/$$f'"; \
- $(kdeprintlprHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprintlprdir)/$$f"; \
- done
-@@ -816,7 +873,7 @@
- uninstall-kdeprintlprHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kdeprintlpr_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdeprintlprdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdeprintlprdir)/$$f"; \
- done
-@@ -922,7 +979,7 @@
- clean-generic:
+ #>+ 3
+ marginpreview.moc: $(srcdir)/marginpreview.h
+@@ -1499,6 +1496,13 @@
+ mocs: marginpreview.moc
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ #>+ 3
++kpposterpage.moc: $(srcdir)/kpposterpage.h
++ $(MOC) $(srcdir)/kpposterpage.h -o kpposterpage.moc
++
++#>+ 2
++mocs: kpposterpage.moc
++
++#>+ 3
+ kmjobmanager.moc: $(srcdir)/kmjobmanager.h
+ $(MOC) $(srcdir)/kmjobmanager.h -o kmjobmanager.moc
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/management/Makefile.in
-+++ kdeprint/management/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+@@ -1527,11 +1531,11 @@
+ mocs: plugincombobox.moc
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,10 @@
+ #>+ 3
+-kdeprintd.moc: $(srcdir)/kdeprintd.h
+- $(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
++driverview.moc: $(srcdir)/driverview.h
++ $(MOC) $(srcdir)/driverview.h -o driverview.moc
+ #>+ 2
+-mocs: kdeprintd.moc
++mocs: driverview.moc
+ #>+ 3
+ kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
+@@ -1541,11 +1545,11 @@
+ mocs: kpgeneralpage.moc
-+#>- SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(libkdeprint_management_module_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(libkdeprint_management_module_la_SOURCES) $(kaddprinterwizard_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,16 +61,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dataicondir)" \
-- "$(DESTDIR)$(kdeprintdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dataicondir)" "$(DESTDIR)$(kdeprintdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
-@@ -138,31 +133,181 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeprint_management_module.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfilter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfonts.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiggeneral.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigjobs.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdbcreator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdb.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdbwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmiconview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kminfopage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kminstancepage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmjobviewer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlistview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmmainview.Plo ./$(DEPDIR)/kmpages.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmprinterview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbackend.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropcontainer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropdriver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropertypage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropgeneral.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropmembers.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialprinterdlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmtimer.Plo ./$(DEPDIR)/kmwbackend.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwclass.Plo ./$(DEPDIR)/kmwdriver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwdriverselect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwdrivertest.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwend.Plo ./$(DEPDIR)/kmwfile.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfobase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfopage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwizard.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwizardpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwlocal.Plo ./$(DEPDIR)/kmwlpd.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwname.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwpassword.Plo ./$(DEPDIR)/kmwsmb.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocket.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocketutil.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommanddlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommandselector.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
-+#>+ 102
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kaddprinterwizard.la.Po $(DEPDIR)/kaddprinterwizard_dummy.Plo $(DEPDIR)/libkdeprint_management_la.all_cpp.P ./$(DEPDIR)/cjanuswidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprint_management_module.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfilter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfonts.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiggeneral.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigjobs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdbcreator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdb.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdbwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmiconview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminfopage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminstancepage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmjobviewer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlistview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmmainview.Plo ./$(DEPDIR)/kmpages.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmprinterview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropcontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropdriver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropertypage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropgeneral.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropmembers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialprinterdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmtimer.Plo ./$(DEPDIR)/kmwbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwclass.Plo ./$(DEPDIR)/kmwdriver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdriverselect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdrivertest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwend.Plo ./$(DEPDIR)/kmwfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfobase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfopage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizardpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwlocal.Plo ./$(DEPDIR)/kmwlpd.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwname.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwpassword.Plo ./$(DEPDIR)/kmwsmb.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocketutil.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommanddlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommandselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kaddprinterwizard.la.Po $(DEPDIR)/kaddprinterwizard_dummy.Plo ./$(DEPDIR)/cjanuswidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprint_management_module.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfilter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfonts.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiggeneral.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigjobs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdbcreator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdb.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdbwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmiconview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminfopage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminstancepage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmjobviewer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlistview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmmainview.Plo ./$(DEPDIR)/kmpages.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmprinterview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropcontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropdriver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropertypage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropgeneral.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropmembers.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialprinterdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmtimer.Plo ./$(DEPDIR)/kmwbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwclass.Plo ./$(DEPDIR)/kmwdriver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdriverselect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdrivertest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwend.Plo ./$(DEPDIR)/kmwfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfobase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfopage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizard.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizardpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwlocal.Plo ./$(DEPDIR)/kmwlpd.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwname.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwpassword.Plo ./$(DEPDIR)/kmwsmb.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocket.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocketutil.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommanddlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommandselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-driverview.moc: $(srcdir)/driverview.h
+- $(MOC) $(srcdir)/driverview.h -o driverview.moc
++kdeprintd.moc: $(srcdir)/kdeprintd.h
++ $(MOC) $(srcdir)/kdeprintd.h -o kdeprintd.moc
+
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+-mocs: driverview.moc
++mocs: kdeprintd.moc
+
#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ kpfilterpage.moc: $(srcdir)/kpfilterpage.h
+@@ -1555,18 +1559,18 @@
+ mocs: kpfilterpage.moc
+
+ #>+ 3
+-kprinterpropertydialog.moc: $(srcdir)/kprinterpropertydialog.h
+- $(MOC) $(srcdir)/kprinterpropertydialog.h -o kprinterpropertydialog.moc
++kmfactory.moc: $(srcdir)/kmfactory.h
++ $(MOC) $(srcdir)/kmfactory.h -o kmfactory.moc
+
#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kaddprinterwizard_la_SOURCES) \
--#>- $(libkdeprint_management_la_SOURCES) \
--#>- $(libkdeprint_management_module_la_SOURCES)
--#>+ 3
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kaddprinterwizard_la_SOURCES) \
- $(libkdeprint_management_la_SOURCES) \
-- $(libkdeprint_management_module_la_SOURCES) $(kaddprinterwizard_SOURCES)
-+ $(libkdeprint_management_module_la_SOURCES)
- #>- DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
- #>- $(libkdeprint_management_la_SOURCES) \
- #>- $(libkdeprint_management_module_la_SOURCES)
-@@ -191,6 +336,8 @@
+-mocs: kprinterpropertydialog.moc
++mocs: kmfactory.moc
+
+ #>+ 3
+-kmfactory.moc: $(srcdir)/kmfactory.h
+- $(MOC) $(srcdir)/kmfactory.h -o kmfactory.moc
++kprinterpropertydialog.moc: $(srcdir)/kprinterpropertydialog.h
++ $(MOC) $(srcdir)/kprinterpropertydialog.h -o kprinterpropertydialog.moc
+
+ #>+ 2
+-mocs: kmfactory.moc
++mocs: kprinterpropertydialog.moc
+
+ #>+ 3
+ kprintprocess.moc: $(srcdir)/kprintprocess.h
+@@ -1583,18 +1587,18 @@
+ mocs: kfilelist.moc
+
+ #>+ 3
+-marginwidget.moc: $(srcdir)/marginwidget.h
+- $(MOC) $(srcdir)/marginwidget.h -o marginwidget.moc
++droptionview.moc: $(srcdir)/droptionview.h
++ $(MOC) $(srcdir)/droptionview.h -o droptionview.moc
+
+ #>+ 2
+-mocs: marginwidget.moc
++mocs: droptionview.moc
+
+ #>+ 3
+-droptionview.moc: $(srcdir)/droptionview.h
+- $(MOC) $(srcdir)/droptionview.h -o droptionview.moc
++marginwidget.moc: $(srcdir)/marginwidget.h
++ $(MOC) $(srcdir)/marginwidget.h -o marginwidget.moc
+
+ #>+ 2
+-mocs: droptionview.moc
++mocs: marginwidget.moc
+
+ #>+ 3
+ kprinterimpl.moc: $(srcdir)/kprinterimpl.h
+@@ -1632,18 +1636,18 @@
+ mocs: kmuimanager.moc
+
+ #>+ 3
+-marginvaluewidget.moc: $(srcdir)/marginvaluewidget.h
+- $(MOC) $(srcdir)/marginvaluewidget.h -o marginvaluewidget.moc
++kmmanager.moc: $(srcdir)/kmmanager.h
++ $(MOC) $(srcdir)/kmmanager.h -o kmmanager.moc
+
+ #>+ 2
+-mocs: marginvaluewidget.moc
++mocs: kmmanager.moc
+
+ #>+ 3
+-kmmanager.moc: $(srcdir)/kmmanager.h
+- $(MOC) $(srcdir)/kmmanager.h -o kmmanager.moc
++marginvaluewidget.moc: $(srcdir)/marginvaluewidget.h
++ $(MOC) $(srcdir)/marginvaluewidget.h -o marginvaluewidget.moc
+
+ #>+ 2
+-mocs: kmmanager.moc
++mocs: marginvaluewidget.moc
+
+ #>+ 3
+ kprintaction.moc: $(srcdir)/kprintaction.h
+@@ -1654,7 +1658,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kprintdialog.moc posterpreview.moc kpposterpage.moc marginpreview.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc kdeprintd.moc kpgeneralpage.moc driverview.moc kpfilterpage.moc kprinterpropertydialog.moc kmfactory.moc kprintprocess.moc kfilelist.moc marginwidget.moc droptionview.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc marginvaluewidget.moc kmmanager.moc kprintaction.moc
++ -rm -f posterpreview.moc kprintdialog.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc driverview.moc kpgeneralpage.moc kdeprintd.moc kpfilterpage.moc kmfactory.moc kprinterpropertydialog.moc kprintprocess.moc kfilelist.moc droptionview.moc marginwidget.moc kprinterimpl.moc kprintdialogpage.moc kprintpreview.moc kpqtpage.moc kmuimanager.moc kmmanager.moc marginvaluewidget.moc kprintaction.moc
+
+ #>+ 2
+ KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am
+--- kdeprint/management/Makefile.in
++++ kdeprint/management/Makefile.in
+@@ -191,6 +191,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -34177,7 +20303,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -232,8 +379,6 @@
+@@ -232,8 +234,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -34186,7 +20312,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -310,7 +455,6 @@
+@@ -310,7 +310,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -34194,7 +20320,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -347,6 +491,9 @@
+@@ -347,6 +346,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -34204,7 +20330,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -402,6 +549,7 @@
+@@ -402,6 +404,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -34212,16 +20338,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +559,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -430,6 +576,7 @@
+@@ -430,6 +433,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -34229,7 +20346,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -644,7 +791,7 @@
+@@ -644,7 +648,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34238,7 +20355,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,16 +829,16 @@
+@@ -682,9 +686,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34250,139 +20367,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -699,8 +846,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -718,7 +865,7 @@
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -726,8 +873,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -745,7 +892,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -753,8 +900,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -877,21 +1024,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -908,7 +1058,7 @@
- test -z "$(dataicondir)" || $(mkdir_p) "$(DESTDIR)$(dataicondir)"
- @list='$(dataicon_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dataiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dataicondir)/$$f'"; \
- $(dataiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dataicondir)/$$f"; \
- done
-@@ -916,7 +1066,7 @@
- uninstall-dataiconDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dataicon_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(dataicondir)/$$f'"; \
- rm -f "$(DESTDIR)$(dataicondir)/$$f"; \
- done
-@@ -925,7 +1075,7 @@
- test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
- @list='$(kdeprint_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdeprintHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprintdir)/$$f'"; \
- $(kdeprintHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprintdir)/$$f"; \
- done
-@@ -933,7 +1083,7 @@
- uninstall-kdeprintHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kdeprint_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdeprintdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdeprintdir)/$$f"; \
- done
-@@ -1041,7 +1191,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1178,18 +1328,18 @@
+@@ -1178,18 +1182,18 @@
mocs: kmpropcontainer.moc
#>+ 3
@@ -34407,7 +20392,7 @@
#>+ 3
kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
-@@ -1213,11 +1363,11 @@
+@@ -1213,11 +1217,11 @@
mocs: kmwclass.moc
#>+ 3
@@ -34422,7 +20407,7 @@
#>+ 3
pluginaction.moc: $(srcdir)/pluginaction.h
-@@ -1241,25 +1391,25 @@
+@@ -1241,25 +1245,25 @@
mocs: kxmlcommanddlg.moc
#>+ 3
@@ -34457,7 +20442,7 @@
#>+ 3
kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
-@@ -1283,18 +1433,18 @@
+@@ -1283,18 +1287,18 @@
mocs: kmmainview.moc
#>+ 3
@@ -34482,7 +20467,7 @@
#>+ 3
cjanuswidget.moc: $(srcdir)/cjanuswidget.h
-@@ -1353,18 +1503,18 @@
+@@ -1353,18 +1357,18 @@
mocs: kmconfiggeneral.moc
#>+ 3
@@ -34507,7 +20492,7 @@
#>+ 3
smbview.moc: $(srcdir)/smbview.h
-@@ -1416,18 +1566,18 @@
+@@ -1416,18 +1420,18 @@
mocs: kmiconview.moc
#>+ 3
@@ -34532,7 +20517,7 @@
#>+ 8
libkdeprint_management_module.la.closure: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES)
-@@ -1440,7 +1590,7 @@
+@@ -1440,7 +1444,7 @@
#>+ 3
clean-metasources:
@@ -34541,7 +20526,7 @@
#>+ 2
KDE_DIST=Makefile.in side.png tileup.png tiledown.png Makefile.am
-@@ -1491,7 +1641,7 @@
+@@ -1491,7 +1495,7 @@
#>+ 11
@@ -34550,7 +20535,7 @@
@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
-@@ -1559,12 +1709,12 @@
+@@ -1559,12 +1563,12 @@
kmlistview.lo: kmlistview.moc
kmwsocketutil.lo: kmwsocketutil.moc
kmconfigdialog.lo: kmconfigdialog.moc
@@ -34567,32 +20552,7 @@
pluginaction.lo: pluginaction.moc
--- kdeprint/pics/Makefile.in
+++ kdeprint/pics/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(icondatadir)"
- icondataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(icondata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -34601,7 +20561,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -34610,7 +20570,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -34618,7 +20578,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -34628,7 +20588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -34636,16 +20596,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -34653,7 +20604,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -500,7 +496,7 @@
+@@ -500,7 +504,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34662,7 +20613,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +534,9 @@
+@@ -538,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34674,34 +20625,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -557,7 +553,7 @@
- test -z "$(icondatadir)" || $(mkdir_p) "$(DESTDIR)$(icondatadir)"
- @list='$(icondata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(icondataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondatadir)/$$f'"; \
- $(icondataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondatadir)/$$f"; \
- done
-@@ -565,7 +561,7 @@
- uninstall-icondataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(icondata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(icondatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(icondatadir)/$$f"; \
- done
-@@ -629,7 +625,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -704,7 +700,7 @@
+@@ -704,7 +708,7 @@
.NOEXPORT:
#>+ 2
@@ -34710,7 +20634,7 @@
#>+ 2
docs-am:
-@@ -712,125 +708,125 @@
+@@ -712,125 +716,125 @@
#>+ 122
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps
@@ -34928,97 +20852,7 @@
force-reedit:
--- kdeprint/rlpr/Makefile.in
+++ kdeprint/rlpr/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kdeprint_rlpr_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,12 +57,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -80,24 +76,49 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmconfigproxy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmproprlpr.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmproxywidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmrlpruimanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwrlpr.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krlprprinterimpl.Plo
-+#>+ 16
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_rlpr_la.all_cpp.P ./$(DEPDIR)/kmconfigproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproprlpr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproxywidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlpruimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwrlpr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krlprprinterimpl.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kmconfigproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproprlpr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproxywidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlpruimanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwrlpr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krlprprinterimpl.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_rlpr_la_SOURCES)
- DIST_SOURCES = $(kdeprint_rlpr_la_SOURCES)
- entryDATA_INSTALL = $(INSTALL_DATA)
-@@ -120,6 +141,8 @@
+@@ -120,6 +120,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -35027,7 +20861,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -161,8 +184,6 @@
+@@ -161,8 +163,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -35036,7 +20870,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -239,7 +260,6 @@
+@@ -239,7 +239,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -35044,7 +20878,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -276,6 +296,9 @@
+@@ -276,6 +275,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -35054,7 +20888,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -331,6 +354,7 @@
+@@ -331,6 +333,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -35062,16 +20896,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -340,8 +364,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -359,6 +381,7 @@
+@@ -359,6 +362,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -35079,7 +20904,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -537,7 +560,7 @@
+@@ -537,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35088,7 +20913,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,16 +598,16 @@
+@@ -575,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35100,145 +20925,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -592,8 +615,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -631,21 +654,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -662,7 +688,7 @@
- test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
- @list='$(entry_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
- $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -670,7 +696,7 @@
- uninstall-entryDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(entry_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
- rm -f "$(DESTDIR)$(entrydir)/$$f"; \
- done
-@@ -776,7 +802,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdeprint/tests/Makefile.in
+++ kdeprint/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -70,24 +72,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/drawdemo.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/helpwindow.Po ./$(DEPDIR)/main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/richpage.Po
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/helpviewer.all_cpp.P ./$(DEPDIR)/drawdemo.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/helpwindow.Po ./$(DEPDIR)/main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/richpage.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/drawdemo.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/helpwindow.Po ./$(DEPDIR)/main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/richpage.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
- DIST_SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
- ETAGS = etags
-@@ -107,6 +119,8 @@
+@@ -107,6 +107,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -35247,7 +20936,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -148,8 +162,6 @@
+@@ -148,8 +150,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -35256,7 +20945,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -226,7 +238,6 @@
+@@ -226,7 +226,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -35264,7 +20953,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -263,6 +274,9 @@
+@@ -263,6 +262,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -35274,7 +20963,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,6 +332,7 @@
+@@ -318,6 +320,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -35282,16 +20971,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -327,8 +342,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -346,6 +359,7 @@
+@@ -346,6 +349,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -35299,7 +20979,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -518,7 +532,7 @@
+@@ -518,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35308,7 +20988,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +570,9 @@
+@@ -556,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35320,57 +21000,83 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -589,21 +603,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+--- kdeprint/tools/escputil/Makefile.in
++++ kdeprint/tools/escputil/Makefile.in
+@@ -115,6 +115,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +158,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +270,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -326,6 +328,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,6 +357,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -527,7 +531,7 @@
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ .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*) \
+@@ -565,9 +569,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -715,7 +732,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
--- kdeprint/tools/Makefile.in
+++ kdeprint/tools/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -35415,16 +21121,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -35432,7 +21129,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +487,7 @@
+@@ -485,7 +489,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -35441,7 +21138,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +525,9 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35453,159 +21150,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
+--- kdesu/Makefile.in
++++ kdesu/Makefile.in
+@@ -134,6 +134,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -175,8 +177,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -253,7 +253,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -290,6 +289,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -345,6 +347,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,6 +376,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -549,7 +553,7 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -587,9 +591,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeprint/tools/escputil/Makefile.in
-+++ kdeprint/tools/escputil/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -75,24 +70,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/escpwidget.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/escpwidget.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
- DIST_SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -115,6 +113,8 @@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
+--- kdeui/about/Makefile.in
++++ kdeui/about/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -35614,7 +21236,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -156,8 +156,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -35623,7 +21245,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -234,7 +232,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -35631,7 +21253,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -271,6 +268,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -35641,7 +21263,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +326,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -35649,16 +21271,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -335,8 +336,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -354,6 +353,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -35666,16 +21279,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -527,7 +527,7 @@
+@@ -487,7 +491,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*) \
-@@ -565,16 +565,16 @@
+@@ -525,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35685,179 +21298,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -582,8 +582,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -614,21 +614,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -645,7 +648,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -653,7 +656,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -759,7 +762,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdesu/Makefile.in
-+++ kdesu/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,14 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(kdesudir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdesudir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -87,32 +82,48 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/client.Plo ./$(DEPDIR)/kcookie.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_pty.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_stub.Po ./$(DEPDIR)/process.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/stub.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/su.Plo
-+#>+ 10
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdesu_la.all_cpp.P ./$(DEPDIR)/client.Plo ./$(DEPDIR)/kcookie.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_pty.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_stub.Po ./$(DEPDIR)/process.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/stub.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/su.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/client.Plo ./$(DEPDIR)/kcookie.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_pty.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_stub.Po ./$(DEPDIR)/process.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/stub.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/su.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
- DIST_SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
- kdesuHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -134,6 +145,8 @@
+--- kdeui/colors/Makefile.in
++++ kdeui/colors/Makefile.in
+@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -35866,7 +21311,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -175,8 +188,6 @@
+@@ -109,8 +111,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -35875,7 +21320,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -253,7 +264,6 @@
+@@ -187,7 +187,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -35883,7 +21328,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -290,6 +300,9 @@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -35893,7 +21338,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,6 +358,7 @@
+@@ -279,6 +281,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -35901,16 +21346,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -354,8 +368,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -373,6 +385,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -35918,16 +21354,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -549,7 +562,7 @@
+@@ -468,7 +472,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .c .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*) \
-@@ -587,16 +600,16 @@
+@@ -506,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35937,529 +21373,86 @@
-$(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)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -604,8 +617,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -677,42 +690,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -729,7 +748,7 @@
- test -z "$(kdesudir)" || $(mkdir_p) "$(DESTDIR)$(kdesudir)"
- @list='$(kdesu_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdesuHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdesudir)/$$f'"; \
- $(kdesuHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdesudir)/$$f"; \
- done
-@@ -737,7 +756,7 @@
- uninstall-kdesuHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kdesu_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdesudir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdesudir)/$$f"; \
- done
-@@ -846,7 +865,7 @@
- clean-generic:
+--- kdeui/kdetrayproxy/Makefile.in
++++ kdeui/kdetrayproxy/Makefile.in
+@@ -118,6 +118,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +161,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +273,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -329,6 +331,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,6 +360,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +534,7 @@
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ .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*) \
+@@ -568,9 +572,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -916,16 +935,15 @@
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
-- install-data install-data-am install-data-hook \
-- install-data-local install-exec install-exec-am install-info \
-- install-info-am install-kdesuHEADERS install-libLTLIBRARIES \
-- install-man install-strip installcheck installcheck-am \
-- installdirs maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-compile mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-- uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-- uninstall-kdesuHEADERS uninstall-libLTLIBRARIES \
-- uninstall-local
-+ install-data install-data-am install-data-local install-exec \
-+ install-exec-am install-info install-info-am \
-+ install-kdesuHEADERS install-libLTLIBRARIES install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-binPROGRAMS uninstall-info-am uninstall-kdesuHEADERS \
-+ uninstall-libLTLIBRARIES uninstall-local
-
-
- install-data-hook:
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
--- kdeui/Makefile.in
+++ kdeui/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,6 +37,8 @@
-
-
-
-+SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -76,15 +78,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(scriptsdir)" \
-- "$(DESTDIR)$(picsdir)" "$(DESTDIR)$(rcdir)" \
-- "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(picsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libkdeui_la_DEPENDENCIES = ../kdecore/libkdecore.la
-@@ -173,24 +167,346 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutapplication.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutkde.Plo ./$(DEPDIR)/kaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionclasses.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactioncollection.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactivelabel.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kanimwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/karrowbutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kauthicon.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbugreport.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonbox.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharselect.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmenumngr.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmodule.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolorbutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolorcombo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolordialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolordrag.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcombobox.Plo ./$(DEPDIR)/kcommand.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbox.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcursor.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicker.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatetbl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdcopactionproxy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget_private.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolorbutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditcl1.Plo ./$(DEPDIR)/keditcl2.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditlistbox.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kedittoolbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontcombo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontrequester.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kguiitem.Plo ./$(DEPDIR)/khelpmenu.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconviewsearchline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeybutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeydialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klanguagebutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kled.Plo ./$(DEPDIR)/klineedit.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klistbox.Plo ./$(DEPDIR)/klistview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klistviewsearchline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindow.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowiface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenubar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmessagebox.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knuminput.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knumvalidator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelapplet.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelappmenu.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelextension.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenu.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpassdlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpassivepopup.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapio.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectorwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpopupmenu.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprogress.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpushbutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krestrictedline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krootpixmap.Plo ./$(DEPDIR)/kruler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kscrollview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kselect.Plo ./$(DEPDIR)/kseparator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksharedpixmap.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell.Plo ./$(DEPDIR)/kspelldlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksplashscreen.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabel.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdguiitem.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstringvalidator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksyntaxhighlighter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtray.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabbar.Plo ./$(DEPDIR)/ktabctl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextbrowser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextedit.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonewidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktip.Plo ./$(DEPDIR)/ktoolbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarbutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarhandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelaction.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarradiogroup.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurllabel.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwhatsthismanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwindowinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwindowlistmenu.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwizard.Plo ./$(DEPDIR)/kwordwrap.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguibuilder.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguiclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory_p.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/qxembed.Plo
-+#>+ 214
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kmainwindowiface_skel.P $(DEPDIR)/kshortcutdialog_simple.P $(DEPDIR)/kshortcutdialog_advanced.P $(DEPDIR)/kspellui.P $(DEPDIR)/libkdeui_la.all_cpp.P ./$(DEPDIR)/dummy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutapplication.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutkde.Plo ./$(DEPDIR)/kaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionclasses.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactioncollection.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactivelabel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kanimwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karrowbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kauthicon.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbugreport.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonbox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharselect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmenumngr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorcombo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombobox.Plo ./$(DEPDIR)/kcommand.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcursor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetbl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopactionproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget_private.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolorbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditcl1.Plo ./$(DEPDIR)/keditcl2.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditlistbox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedittoolbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontcombo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontrequester.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kguiitem.Plo ./$(DEPDIR)/khelpmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconviewsearchline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeybutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeydialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klanguagebutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kled.Plo ./$(DEPDIR)/klineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistbox.Plo ./$(DEPDIR)/klistview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistviewsearchline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowiface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenubar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmessagebox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knuminput.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knumvalidator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelapplet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelappmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassivepopup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectorwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpopupmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprogress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpushbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krestrictedline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootpixmap.Plo ./$(DEPDIR)/kruler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscrollview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kselect.Plo ./$(DEPDIR)/kseparator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksharedpixmap.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell.Plo ./$(DEPDIR)/kspelldlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksplashscreen.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdguiitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringvalidator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksyntaxhighlighter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtray.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabbar.Plo ./$(DEPDIR)/ktabctl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextbrowser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktip.Plo ./$(DEPDIR)/ktoolbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarradiogroup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurllabel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwhatsthismanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowlistmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwizard.Plo ./$(DEPDIR)/kwordwrap.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguibuilder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguiclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory_p.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qxembed.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kmainwindowiface_skel.P $(DEPDIR)/kshortcutdialog_simple.P $(DEPDIR)/kshortcutdialog_advanced.P $(DEPDIR)/kspellui.P ./$(DEPDIR)/dummy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutapplication.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutkde.Plo ./$(DEPDIR)/kaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionclasses.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactioncollection.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactivelabel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kanimwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karrowbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kauthicon.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbugreport.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonbox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharselect.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmenumngr.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorcombo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombobox.Plo ./$(DEPDIR)/kcommand.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcursor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetbl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopactionproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget_private.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolorbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditcl1.Plo ./$(DEPDIR)/keditcl2.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditlistbox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedittoolbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontcombo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontrequester.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kguiitem.Plo ./$(DEPDIR)/khelpmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconviewsearchline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeybutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeydialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klanguagebutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kled.Plo ./$(DEPDIR)/klineedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistbox.Plo ./$(DEPDIR)/klistview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistviewsearchline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowiface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenubar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmessagebox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knuminput.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knumvalidator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelapplet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelappmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassivepopup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectorwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpopupmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprogress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpushbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krestrictedline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootpixmap.Plo ./$(DEPDIR)/kruler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscrollview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kselect.Plo ./$(DEPDIR)/kseparator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksharedpixmap.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell.Plo ./$(DEPDIR)/kspelldlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksplashscreen.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdguiitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringvalidator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksyntaxhighlighter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtray.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabbar.Plo ./$(DEPDIR)/ktabctl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextbrowser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextedit.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonewidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktip.Plo ./$(DEPDIR)/ktoolbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelaction.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarradiogroup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurllabel.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwhatsthismanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowlistmenu.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwizard.Plo ./$(DEPDIR)/kwordwrap.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguibuilder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguiclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory_p.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/qxembed.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
- DIST_SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -229,6 +545,8 @@
+@@ -229,6 +229,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -36468,7 +21461,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -270,8 +588,6 @@
+@@ -270,8 +272,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -36477,7 +21470,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -348,7 +664,6 @@
+@@ -348,7 +348,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -36485,7 +21478,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -385,6 +700,9 @@
+@@ -385,6 +384,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -36495,7 +21488,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,6 +758,7 @@
+@@ -440,6 +442,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -36503,16 +21496,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -449,8 +768,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -468,6 +785,7 @@
+@@ -468,6 +471,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -36520,7 +21504,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -800,7 +1118,7 @@
+@@ -800,7 +804,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36529,7 +21513,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -838,16 +1156,16 @@
+@@ -838,9 +842,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36541,187 +21525,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -855,8 +1173,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -1032,21 +1350,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -1063,7 +1384,7 @@
- test -z "$(picsdir)" || $(mkdir_p) "$(DESTDIR)$(picsdir)"
- @list='$(pics_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(picsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(picsdir)/$$f'"; \
- $(picsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(picsdir)/$$f"; \
- done
-@@ -1071,7 +1392,7 @@
- uninstall-picsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pics_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(picsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(picsdir)/$$f"; \
- done
-@@ -1080,7 +1401,7 @@
- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
- @list='$(rc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
- $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -1088,7 +1409,7 @@
- uninstall-rcDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(rc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
- rm -f "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -1097,7 +1418,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -1105,7 +1426,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -1117,13 +1438,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1135,7 +1450,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1143,13 +1458,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1170,7 +1479,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1270,17 +1579,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1312,7 +1619,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1559,11 +1866,11 @@
+@@ -1559,11 +1563,11 @@
mocs: kcompletionbox.moc
#>+ 3
@@ -36736,7 +21540,7 @@
#>+ 3
kactionclasses.moc: $(srcdir)/kactionclasses.h
-@@ -1573,11 +1880,11 @@
+@@ -1573,11 +1577,11 @@
mocs: kactionclasses.moc
#>+ 3
@@ -36751,7 +21555,7 @@
#>+ 3
kshortcutdialog.moc: $(srcdir)/kshortcutdialog.h
-@@ -1601,18 +1908,18 @@
+@@ -1601,18 +1605,18 @@
mocs: kdialogbase.moc
#>+ 3
@@ -36776,7 +21580,7 @@
#>+ 3
kbuttonbox.moc: $(srcdir)/kbuttonbox.h
-@@ -1678,13 +1985,6 @@
+@@ -1678,13 +1682,6 @@
mocs: kpassdlg.moc
#>+ 3
@@ -36790,7 +21594,7 @@
klineeditdlg.moc: $(srcdir)/klineeditdlg.h
$(MOC) $(srcdir)/klineeditdlg.h -o klineeditdlg.moc
-@@ -1692,11 +1992,11 @@
+@@ -1692,11 +1689,11 @@
mocs: klineeditdlg.moc
#>+ 3
@@ -36805,7 +21609,7 @@
#>+ 3
kkeybutton.moc: $(srcdir)/kkeybutton.h
-@@ -1706,6 +2006,13 @@
+@@ -1706,6 +1703,13 @@
mocs: kkeybutton.moc
#>+ 3
@@ -36819,7 +21623,7 @@
kpopupmenu.moc: $(srcdir)/kpopupmenu.h
$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
-@@ -1720,18 +2027,18 @@
+@@ -1720,18 +1724,18 @@
mocs: kmainwindow.moc
#>+ 3
@@ -36844,7 +21648,7 @@
#>+ 3
ktabwidget.moc: $(srcdir)/ktabwidget.h
-@@ -1769,6 +2076,13 @@
+@@ -1769,6 +1773,13 @@
mocs: kaction.moc
#>+ 3
@@ -36858,7 +21662,7 @@
kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
-@@ -1783,11 +2097,11 @@
+@@ -1783,11 +1794,11 @@
mocs: ktextbrowser.moc
#>+ 3
@@ -36873,7 +21677,7 @@
#>+ 3
khelpmenu.moc: $(srcdir)/khelpmenu.h
-@@ -1797,13 +2111,6 @@
+@@ -1797,13 +1808,6 @@
mocs: khelpmenu.moc
#>+ 3
@@ -36887,7 +21691,7 @@
kdatewidget.moc: $(srcdir)/kdatewidget.h
$(MOC) $(srcdir)/kdatewidget.h -o kdatewidget.moc
-@@ -1818,13 +2125,6 @@
+@@ -1818,13 +1822,6 @@
mocs: ktoolbarradiogroup.moc
#>+ 3
@@ -36901,7 +21705,7 @@
kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
-@@ -1839,18 +2139,18 @@
+@@ -1839,18 +1836,18 @@
mocs: kanimwidget.moc
#>+ 3
@@ -36926,7 +21730,7 @@
#>+ 3
ktimewidget.moc: $(srcdir)/ktimewidget.h
-@@ -1860,11 +2160,11 @@
+@@ -1860,11 +1857,11 @@
mocs: ktimewidget.moc
#>+ 3
@@ -36941,7 +21745,7 @@
#>+ 3
klistviewsearchline.moc: $(srcdir)/klistviewsearchline.h
-@@ -1874,6 +2174,13 @@
+@@ -1874,6 +1871,13 @@
mocs: klistviewsearchline.moc
#>+ 3
@@ -36955,7 +21759,7 @@
klanguagebutton.moc: $(srcdir)/klanguagebutton.h
$(MOC) $(srcdir)/klanguagebutton.h -o klanguagebutton.moc
-@@ -1916,18 +2223,18 @@
+@@ -1916,18 +1920,18 @@
mocs: kfontdialog.moc
#>+ 3
@@ -36980,7 +21784,7 @@
#>+ 3
kurllabel.moc: $(srcdir)/kurllabel.h
-@@ -1986,11 +2293,11 @@
+@@ -1986,11 +1990,11 @@
mocs: kedittoolbar.moc
#>+ 3
@@ -36995,7 +21799,7 @@
#>+ 3
ktimezonewidget.moc: $(srcdir)/ktimezonewidget.h
-@@ -2000,11 +2307,11 @@
+@@ -2000,11 +2004,11 @@
mocs: ktimezonewidget.moc
#>+ 3
@@ -37010,7 +21814,7 @@
#>+ 3
klineedit.moc: $(srcdir)/klineedit.h
-@@ -2189,18 +2496,18 @@
+@@ -2189,18 +2193,18 @@
mocs: kdockwidget_private.moc
#>+ 3
@@ -37035,7 +21839,7 @@
#>+ 3
kcolordialog.moc: $(srcdir)/kcolordialog.h
-@@ -2290,7 +2597,7 @@
+@@ -2290,7 +2294,7 @@
#>+ 3
clean-metasources:
@@ -37044,7 +21848,7 @@
#>+ 2
KDE_DIST=TODO.xmlgui libkdeui.nmcheck Makefile.in aboutkde.png ktoolbarhandler.h libkdeui_weak.nmcheck MAINTAINERS kshortcutdialog_advanced.ui kspellui.ui ui_standards.rc ktip-bulb.png preparetips ktip-background.png kshortcutdialog_simple.ui TODO.kspell README.kspell kxmlgui.xsd Makefile.am
-@@ -2353,7 +2660,7 @@
+@@ -2353,7 +2357,7 @@
#>+ 11
@@ -37053,650 +21857,9 @@
@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
---- kdeui/about/Makefile.in
-+++ kdeui/about/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_infopage_datadir)"
- kde_infopage_dataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kde_infopage_data_DATA)
-@@ -78,6 +72,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -487,7 +483,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*) \
-@@ -525,9 +521,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -544,7 +540,7 @@
- test -z "$(kde_infopage_datadir)" || $(mkdir_p) "$(DESTDIR)$(kde_infopage_datadir)"
- @list='$(kde_infopage_data_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_infopage_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_infopage_datadir)/$$f'"; \
- $(kde_infopage_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_infopage_datadir)/$$f"; \
- done
-@@ -552,7 +548,7 @@
- uninstall-kde_infopage_dataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_infopage_data_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_infopage_datadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_infopage_datadir)/$$f"; \
- done
-@@ -616,7 +612,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeui/colors/Makefile.in
-+++ kdeui/colors/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,6 +68,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -109,8 +111,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -187,7 +187,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -224,6 +223,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -279,6 +281,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -468,7 +470,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*) \
-@@ -506,9 +508,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -577,7 +579,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kdeui/kdetrayproxy/Makefile.in
-+++ kdeui/kdetrayproxy/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kded_kdetrayproxy_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -78,24 +73,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kdetrayproxy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/module.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/module_skel.P $(DEPDIR)/kded_kdetrayproxy_la.all_cpp.P ./$(DEPDIR)/kdetrayproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/module.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/module_skel.P ./$(DEPDIR)/kdetrayproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/module.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kdetrayproxy_la_SOURCES)
- DIST_SOURCES = $(kded_kdetrayproxy_la_SOURCES)
- servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -118,6 +120,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -159,8 +163,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -237,7 +239,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -274,6 +275,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -329,6 +333,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,8 +343,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -357,6 +360,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -530,7 +534,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*) \
-@@ -568,16 +572,16 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -585,8 +589,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -615,21 +619,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -646,7 +653,7 @@
- test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
- @list='$(services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
- $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -654,7 +661,7 @@
- uninstall-servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -760,7 +767,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdeui/tests/Makefile.in
+++ kdeui/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -33,6 +33,8 @@
- # along with this library; see the file COPYING.LIB. If not, write to
- # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- # Boston, MA 02110-1301, USA.
-+SOURCES = $(itemcontainertest_SOURCES) $(kaboutdialogtest_SOURCES) $(kaccelgentest_SOURCES) $(kactiontest_SOURCES) $(kblendtest_SOURCES) $(kbuttonboxtest_SOURCES) $(kcharselecttest_SOURCES) $(kcolordlgtest_SOURCES) $(kcolortest_SOURCES) $(kcomboboxtest_SOURCES) $(kcompletiontest_SOURCES) $(kdatepicktest_SOURCES) $(kdatetimewidgettest_SOURCES) $(kdatewidgettest_SOURCES) $(kdesattest_SOURCES) $(kdialogbasetest_SOURCES) $(kdocktest_SOURCES) $(kdockwidgetdemo_SOURCES) $(kdockwidgettest_SOURCES) $(kdualcolortest_SOURCES) $(keditlistboxtest_SOURCES) $(kedittest_SOURCES) $(kfontdialogtest_SOURCES) $(kgradienttest_SOURCES) $(khashtest_SOURCES) $(kinputdialogtest_SOURCES) $(kjanuswidgettest_SOURCES) $(kledtest_SOURCES) $(klineeditdlgtest_SOURCES) $(klineedittest_SOURCES) $(klistviewtest_SOURCES) $(kmainwindowrestoretest_SOURCES) $(kmainwindowtest_SOURCES) $(kmessageboxtest_SOURCES) $(knuminputtest_SOURCES) $(kpalettetest_SOURCES) $(kpanelmenutest_SOURCES) $(kpixmapregionselectordialogtest_SOURCES) $(kpopuptest_SOURCES) $(kprogresstest_SOURCES) $(krulertest_SOURCES) $(kseparatortest_SOURCES) $(kspelltest_SOURCES) $(ksqueezedtextlabeltest_SOURCES) $(kstatusbartest_SOURCES) $(ksystemtraytest_SOURCES) $(ktabctltest_SOURCES) $(ktabwidgettest_SOURCES) $(ktextedittest_SOURCES) $(ktimewidgettest_SOURCES) $(ktoolbarlabelactiontest_SOURCES) $(kunbalancedgrdtest_SOURCES) $(kwindowtest_SOURCES) $(kwizardtest_SOURCES) $(kwordwraptest_SOURCES) $(kxmlguitest_SOURCES) $(qxembedtest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -447,24 +449,139 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/itemcontainertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialogtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelgentest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactiontest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kblendtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonboxtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharselecttest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolordlgtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolortest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcomboboxtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletiontest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicktest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidgettest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidgettest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesattest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbasetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdocktest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgetdemo.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgettest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolortest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditlistboxtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kedittest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialogtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kgradienttest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khashtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialogtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidgettest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kledtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlgtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klineedittest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klistviewtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowrestoretest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmessageboxtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knuminputtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpalettetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenutest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialogtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpopuptest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprogresstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krulertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kseparatortest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspelltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabeltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbartest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtraytest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabctltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidgettest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextedittest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidgettest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelactiontest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kunbalancedgrdtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwindowtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwizardtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwordwraptest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguitest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/qxembedtest.Po
-+#>+ 57
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/itemcontainertest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialogtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelgentest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactiontest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kblendtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonboxtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharselecttest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordlgtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolortest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcomboboxtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletiontest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicktest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidgettest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidgettest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesattest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbasetest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdocktest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgetdemo.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgettest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolortest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditlistboxtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedittest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialogtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kgradienttest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khashtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialogtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidgettest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kledtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlgtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineedittest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistviewtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowrestoretest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmessageboxtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knuminputtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpalettetest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenutest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialogtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpopuptest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprogresstest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krulertest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kseparatortest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspelltest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabeltest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbartest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtraytest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabctltest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidgettest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextedittest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidgettest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelactiontest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kunbalancedgrdtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwizardtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwordwraptest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguitest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qxembedtest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(itemcontainertest_SOURCES) $(kaboutdialogtest_SOURCES) \
- $(kaccelgentest_SOURCES) $(kactiontest_SOURCES) \
- $(kblendtest_SOURCES) $(kbuttonboxtest_SOURCES) \
-@@ -542,6 +659,8 @@
+@@ -542,6 +542,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -37705,7 +21868,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -583,8 +702,6 @@
+@@ -583,8 +585,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -37714,7 +21877,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -661,7 +778,6 @@
+@@ -661,7 +661,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -37722,7 +21885,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -698,6 +814,9 @@
+@@ -698,6 +697,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -37732,7 +21895,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -753,6 +872,7 @@
+@@ -753,6 +755,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -37740,16 +21903,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -762,8 +882,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -781,6 +899,7 @@
+@@ -781,6 +784,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -37757,7 +21911,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -1006,7 +1125,7 @@
+@@ -1006,7 +1010,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -37766,7 +21920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1044,9 +1163,9 @@
+@@ -1044,9 +1048,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37778,44 +21932,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -1295,21 +1414,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -1421,7 +1543,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1499,18 +1621,18 @@
+@@ -1499,18 +1503,18 @@
.NOEXPORT:
#>+ 3
@@ -37840,7 +21957,7 @@
#>+ 3
kstatusbartest.moc: $(srcdir)/kstatusbartest.h
-@@ -1534,18 +1656,18 @@
+@@ -1534,18 +1538,18 @@
mocs: khashtest.moc
#>+ 3
@@ -37865,7 +21982,7 @@
#>+ 3
kcompletiontest.moc: $(srcdir)/kcompletiontest.h
-@@ -1625,18 +1747,18 @@
+@@ -1625,18 +1629,18 @@
mocs: kdesattest.moc
#>+ 3
@@ -37890,7 +22007,7 @@
#>+ 3
kunbalancedgrdtest.moc: $(srcdir)/kunbalancedgrdtest.h
-@@ -1654,7 +1776,7 @@
+@@ -1654,7 +1658,7 @@
#>+ 3
clean-metasources:
@@ -37901,82 +22018,7 @@
KDE_DIST=kdockwidgettest.h background_1.png kmainwindowtest.h Makefile.in kmainwindowrestoretest.h ktoolbarlabelactiontestui.rc ktabwidgettest.h kcompletiontest.h kstatusbartest.h kxmlguitest_shell.rc kunbalancedgrdtest.h ktabctltest.h kdocktest.h knuminputtest.h kdualcolortest.h RayTracedGear.png kxmlguitest.h khashtest.h kwindowtest.h klineedittest.h kledtest.h kcomboboxtest.h kdockwidgetdemo.h krulertest.h kcolortest.h kalphaicontest.h kblendtest.h kgradienttest.h itemcontainertest.h kxmlguitest_part.rc kpanelmenutest.h testimage.png go.png kdesattest.h Makefile.am
--- kdewidgets/Makefile.in
+++ kdewidgets/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -74,12 +76,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_widgetdir)" "$(DESTDIR)$(bindir)"
- kde_widgetLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_widget_LTLIBRARIES)
-@@ -104,24 +100,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/classpreviews.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdewidgets.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/makekdewidgets.Po
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdewidgets_la.all_cpp.P ./$(DEPDIR)/classpreviews.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdewidgets.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/makekdewidgets.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/classpreviews.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdewidgets.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/makekdewidgets.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
- DIST_SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -155,6 +161,8 @@
+@@ -155,6 +155,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -37985,7 +22027,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -196,8 +204,6 @@
+@@ -196,8 +198,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -37994,7 +22036,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -274,7 +280,6 @@
+@@ -274,7 +274,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -38002,7 +22044,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -311,6 +316,9 @@
+@@ -311,6 +310,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -38012,7 +22054,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,6 +374,7 @@
+@@ -366,6 +368,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -38020,16 +22062,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,8 +384,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -394,6 +401,7 @@
+@@ -394,6 +397,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -38037,7 +22070,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -567,7 +575,7 @@
+@@ -567,7 +571,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -38046,7 +22079,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,16 +613,16 @@
+@@ -605,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -38058,160 +22091,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_widgetdir)" || $(mkdir_p) "$(DESTDIR)$(kde_widgetdir)"
- @list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_widgetLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_widgetdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_widgetLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_widgetdir)/$$f"; \
- else :; fi; \
-@@ -622,8 +630,8 @@
-
- uninstall-kde_widgetLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_widgetdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_widgetdir)/$$p"; \
- done
-@@ -687,21 +695,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -721,13 +732,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -739,7 +744,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -747,13 +752,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -774,7 +773,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -873,17 +872,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -916,7 +913,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdewidgets/pics/Makefile.in
+++ kdewidgets/pics/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kdewidgetsdatadir)"
- kdewidgetsdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kdewidgetsdata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -38220,7 +22102,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -38229,7 +22111,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -38237,7 +22119,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -38247,7 +22129,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -38255,16 +22137,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -38272,7 +22145,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -493,7 +489,7 @@
+@@ -493,7 +497,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -38281,7 +22154,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +527,9 @@
+@@ -531,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -38293,47 +22166,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -550,7 +546,7 @@
- test -z "$(kdewidgetsdatadir)" || $(mkdir_p) "$(DESTDIR)$(kdewidgetsdatadir)"
- @list='$(kdewidgetsdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdewidgetsdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdewidgetsdatadir)/$$f'"; \
- $(kdewidgetsdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdewidgetsdatadir)/$$f"; \
- done
-@@ -558,7 +554,7 @@
- uninstall-kdewidgetsdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdewidgetsdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdewidgetsdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdewidgetsdatadir)/$$f"; \
- done
-@@ -622,7 +618,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdewidgets/tests/Makefile.in
+++ kdewidgets/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -87,6 +87,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -38378,16 +22212,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -307,8 +310,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -326,6 +327,7 @@
+@@ -326,6 +329,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -38395,7 +22220,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -488,7 +490,7 @@
+@@ -488,7 +492,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -38404,7 +22229,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +528,9 @@
+@@ -526,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -38416,53 +22241,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -599,7 +601,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kdoctools/Makefile.in
+++ kdoctools/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,6 +19,8 @@
-
-
-
-+SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) $(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -59,20 +61,13 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES = checkXML
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" \
-- "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(updatedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(updatedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+@@ -72,7 +72,8 @@
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
kio_ghelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -38472,7 +22253,7 @@
am_kio_ghelp_la_OBJECTS = kio_help.lo main_ghelp.lo xslt.lo
#>- kio_ghelp_la_OBJECTS = $(am_kio_ghelp_la_OBJECTS)
#>+ 4
-@@ -81,7 +76,8 @@
+@@ -81,7 +82,8 @@
@KDE_USE_FINAL_FALSE at kio_ghelp_la_OBJECTS = $(kio_ghelp_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kio_ghelp_la_OBJECTS = $(kio_ghelp_la_final_OBJECTS)
kio_help_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -38482,7 +22263,7 @@
am_kio_help_la_OBJECTS = kio_help.lo main.lo xslt.lo
#>- kio_help_la_OBJECTS = $(am_kio_help_la_OBJECTS)
#>+ 4
-@@ -89,8 +85,7 @@
+@@ -89,8 +91,7 @@
kio_help_la_nofinal_OBJECTS = kio_help.lo main.lo xslt.lo
@KDE_USE_FINAL_FALSE at kio_help_la_OBJECTS = $(kio_help_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kio_help_la_OBJECTS = $(kio_help_la_final_OBJECTS)
@@ -38492,7 +22273,7 @@
am_libkbzipfilter_dummy_la_OBJECTS = kbzip2filter.lo
#>- libkbzipfilter_dummy_la_OBJECTS = \
#>- $(am_libkbzipfilter_dummy_la_OBJECTS)
-@@ -103,6 +98,7 @@
+@@ -103,6 +104,7 @@
#>+ 1
meinproc_OBJECTS = meinproc.$(OBJEXT)
meinproc_DEPENDENCIES = xslt_pure.o libkbzipfilter_dummy.la \
@@ -38500,51 +22281,7 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-@@ -110,24 +106,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kio_help.Plo ./$(DEPDIR)/main.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/main_ghelp.Plo ./$(DEPDIR)/meinproc.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/xslt.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kio_ghelp_la.all_cpp.P $(DEPDIR)/kio_help_la.all_cpp.P ./$(DEPDIR)/kbzip2filter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_help.Plo ./$(DEPDIR)/main.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main_ghelp.Plo ./$(DEPDIR)/meinproc.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xslt.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_help.Plo ./$(DEPDIR)/main.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main_ghelp.Plo ./$(DEPDIR)/meinproc.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xslt.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
- $(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
- DIST_SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
-@@ -153,6 +162,8 @@
+@@ -153,6 +155,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -38553,7 +22290,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -194,8 +205,6 @@
+@@ -194,8 +198,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -38562,7 +22299,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -272,7 +281,6 @@
+@@ -272,7 +274,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -38570,7 +22307,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -309,6 +317,9 @@
+@@ -309,6 +310,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -38580,7 +22317,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -364,6 +375,7 @@
+@@ -364,6 +368,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -38588,16 +22325,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +385,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -392,6 +402,7 @@
+@@ -392,6 +397,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -38605,7 +22333,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -552,20 +563,19 @@
+@@ -552,20 +558,19 @@
AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
noinst_LTLIBRARIES = libkbzipfilter_dummy.la
libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
@@ -38629,7 +22357,7 @@
meinproc_SOURCES = meinproc.cpp
bin_SCRIPTS = checkXML
#>- METASOURCES = AUTO
-@@ -579,7 +589,7 @@
+@@ -579,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -38638,7 +22366,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +627,9 @@
+@@ -617,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -38650,229 +22378,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -628,7 +638,7 @@
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -636,8 +646,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -758,21 +768,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -789,7 +802,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -797,7 +810,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -806,7 +819,7 @@
- test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
- @list='$(update_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
- $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -814,7 +827,7 @@
- uninstall-updateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(update_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -923,7 +936,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1154,7 +1167,7 @@
-
-
- #>+ 2
--KDE_DIST=kio_help.upd move_kio_help_cache.sh Makefile.in man-template.docbook LICENSE configure.in.in kbuildsycoca.man.docbook kbuildsycoca.refentry.docbook template.docbook xslt.h help.protocol ghelp.protocol checkXML.in Makefile.am
-+KDE_DIST=kio_help.upd move_kio_help_cache.sh Makefile.in man-template.docbook LICENSE configure.in.in template.docbook xslt.h help.protocol ghelp.protocol checkXML.in Makefile.am
-
- #>+ 3
- clean-closures:
---- khtml/Makefile.in
-+++ khtml/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -36,6 +36,8 @@
-
-
-
-+SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) $(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) $(testkhtml_static_SOURCES) $(testregression_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -77,15 +79,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)" \
-- "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(includedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -152,24 +146,73 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/domtreeview.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/imgdummy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_events.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_ext.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_factory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_iface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_pagecache.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_part.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_printsettings.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_run.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_settings.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtmlimage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtmlview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_regression.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_regression_fontoverload.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testkhtml.Po
-+#>+ 32
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/khtml_iface_skel.P $(DEPDIR)/kjserrordlg.P $(DEPDIR)/htmlpageinfo.P $(DEPDIR)/libkhtml_la.all_cc.P $(DEPDIR)/libkhtml_la.all_cpp.P $(DEPDIR)/testkhtml.all_cpp.P $(DEPDIR)/testkhtml_static.all_cpp.P $(DEPDIR)/testregression.all_cpp.P ./$(DEPDIR)/domtreeview.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/imgdummy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_events.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_ext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_factory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_iface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_pagecache.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_part.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_printsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_run.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_settings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlimage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression_fontoverload.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkhtml.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/khtml_iface_skel.P $(DEPDIR)/kjserrordlg.P $(DEPDIR)/htmlpageinfo.P ./$(DEPDIR)/domtreeview.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/imgdummy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_events.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_ext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_factory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_iface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_pagecache.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_part.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_printsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_run.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_settings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlimage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression_fontoverload.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkhtml.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) \
- $(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) \
- $(testkhtml_static_SOURCES) $(testregression_SOURCES)
-@@ -213,6 +256,8 @@
+--- khtml/css/Makefile.in
++++ khtml/css/Makefile.in
+@@ -137,6 +137,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -38881,7 +22389,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -254,8 +299,6 @@
+@@ -178,8 +180,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -38890,7 +22398,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -332,7 +375,6 @@
+@@ -256,7 +256,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -38898,7 +22406,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -369,6 +411,9 @@
+@@ -293,6 +292,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -38908,7 +22416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,6 +469,7 @@
+@@ -348,6 +350,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -38916,16 +22424,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -433,8 +479,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -452,6 +496,7 @@
+@@ -376,6 +379,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -38933,16 +22432,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -689,7 +734,7 @@
+@@ -564,7 +568,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)
+ .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*) \
-@@ -727,16 +772,16 @@
+@@ -602,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -38952,322 +22451,20 @@
-$(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)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -744,8 +789,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -763,7 +808,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -771,8 +816,8 @@
+ clean-noinstLTLIBRARIES:
+@@ -872,7 +876,7 @@
+ .NOEXPORT:
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -845,42 +890,48 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ #>+ 2
+-KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp tokenizer.flex makevalues quirks.css cssproperties.h cssvalues.h cssproperties.in cssproperties.c makeprop Makefile.am
++KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp makevalues tokenizer.flex quirks.css cssproperties.h cssvalues.h cssproperties.c cssproperties.in makeprop Makefile.am
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -897,7 +948,7 @@
- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
- @list='$(rc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
- $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -905,7 +956,7 @@
- uninstall-rcDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(rc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
- rm -f "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -914,7 +965,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -922,7 +973,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -931,7 +982,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -939,7 +990,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -951,13 +1002,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -969,7 +1014,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -977,13 +1022,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1004,7 +1043,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1107,14 +1146,12 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1148,7 +1185,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- khtml/css/Makefile.in
-+++ khtml/css/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -36,6 +36,8 @@
-
-
-
-+SOURCES = $(libkhtmlcss_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -90,32 +92,54 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/css_base.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_renderstyledeclarationimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_ruleimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheetimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_valueimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/csshelper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cssparser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/cssstyleselector.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo
-+#>+ 18
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlcss_la.all_cpp.P ./$(DEPDIR)/css_base.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_renderstyledeclarationimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_ruleimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheetimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_valueimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/csshelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssparser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssstyleselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/css_base.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_renderstyledeclarationimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_ruleimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheetimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_valueimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/csshelper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssparser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssstyleselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlcss_la_SOURCES)
- DIST_SOURCES = $(libkhtmlcss_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(cssdir)"
- cssDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(css_DATA)
-@@ -137,6 +161,8 @@
+ docs-am:
+--- khtml/dom/Makefile.in
++++ khtml/dom/Makefile.in
+@@ -143,6 +143,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -39276,7 +22473,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -178,8 +204,6 @@
+@@ -184,8 +186,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -39285,7 +22482,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -256,7 +280,6 @@
+@@ -262,7 +262,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -39293,7 +22490,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -293,6 +316,9 @@
+@@ -299,6 +298,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -39303,7 +22500,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,6 +374,7 @@
+@@ -354,6 +356,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -39311,16 +22508,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +384,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -376,6 +401,7 @@
+@@ -382,6 +385,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -39328,7 +22516,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -564,7 +590,7 @@
+@@ -575,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -39337,7 +22525,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +628,9 @@
+@@ -613,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -39349,203 +22537,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -638,21 +664,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -669,7 +698,7 @@
- test -z "$(cssdir)" || $(mkdir_p) "$(DESTDIR)$(cssdir)"
- @list='$(css_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(cssDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cssdir)/$$f'"; \
- $(cssDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cssdir)/$$f"; \
- done
-@@ -677,7 +706,7 @@
- uninstall-cssDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(css_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(cssdir)/$$f'"; \
- rm -f "$(DESTDIR)$(cssdir)/$$f"; \
- done
-@@ -783,7 +812,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -872,7 +901,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp tokenizer.flex makevalues quirks.css cssproperties.h cssvalues.h cssproperties.in cssproperties.c makeprop Makefile.am
-+KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp makevalues tokenizer.flex quirks.css cssproperties.h cssvalues.h cssproperties.c cssproperties.in makeprop Makefile.am
-
- #>+ 2
- docs-am:
---- khtml/dom/Makefile.in
-+++ khtml/dom/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkhtmldom_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -97,32 +99,96 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/css_rule.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheet.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_value.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_events.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_range.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversal.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_views.Plo ./$(DEPDIR)/dom_doc.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_element.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_misc.Plo ./$(DEPDIR)/dom_node.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_string.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_text.Plo ./$(DEPDIR)/dom_xml.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_base.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_block.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_document.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_element.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_form.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_head.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_image.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_inline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_list.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_misc.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_table.Plo
-+#>+ 46
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmldom_la.all_cpp.P ./$(DEPDIR)/css_rule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_value.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_events.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_range.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_views.Plo ./$(DEPDIR)/dom_doc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_element.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_misc.Plo ./$(DEPDIR)/dom_node.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_string.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_text.Plo ./$(DEPDIR)/dom_xml.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_base.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_block.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_document.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_element.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_form.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_head.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_image.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_list.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_misc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_table.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/css_rule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_value.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_events.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_range.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_views.Plo ./$(DEPDIR)/dom_doc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_element.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_misc.Plo ./$(DEPDIR)/dom_node.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_string.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_text.Plo ./$(DEPDIR)/dom_xml.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_base.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_block.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_document.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_element.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_form.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_head.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_image.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_list.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_misc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_table.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmldom_la_SOURCES)
- DIST_SOURCES = $(libkhtmldom_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(myincludedir)"
- myincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(myinclude_HEADERS)
-@@ -143,6 +209,8 @@
+--- khtml/ecma/Makefile.in
++++ khtml/ecma/Makefile.in
+@@ -130,6 +130,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -39554,7 +22548,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -184,8 +252,6 @@
+@@ -171,8 +173,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -39563,7 +22557,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -262,7 +328,6 @@
+@@ -249,7 +249,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -39571,7 +22565,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -299,6 +364,9 @@
+@@ -286,6 +285,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -39581,7 +22575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -354,6 +422,7 @@
+@@ -341,6 +343,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -39589,16 +22583,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,8 +432,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -382,6 +449,7 @@
+@@ -369,6 +372,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -39606,7 +22591,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -575,7 +643,7 @@
+@@ -552,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -39615,7 +22600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +681,9 @@
+@@ -590,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -39627,162 +22612,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -666,21 +734,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -697,7 +768,7 @@
- test -z "$(myincludedir)" || $(mkdir_p) "$(DESTDIR)$(myincludedir)"
- @list='$(myinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(myincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(myincludedir)/$$f'"; \
- $(myincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(myincludedir)/$$f"; \
- done
-@@ -705,7 +776,7 @@
- uninstall-myincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(myinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(myincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(myincludedir)/$$f"; \
- done
-@@ -811,7 +882,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- khtml/ecma/Makefile.in
-+++ khtml/ecma/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkjs_html_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -92,24 +94,70 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/domparser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_binding.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_css.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_debugwin.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_dom.Plo ./$(DEPDIR)/kjs_events.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_html.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_mozilla.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_navigator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_proxy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_range.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_traversal.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_views.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_window.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/xmlhttprequest.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/xmlserializer.Plo
-+#>+ 30
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkjs_html_la.all_cpp.P ./$(DEPDIR)/domparser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_binding.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_css.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_debugwin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_dom.Plo ./$(DEPDIR)/kjs_events.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_html.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_mozilla.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_navigator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_proxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_range.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_traversal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_views.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_window.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlhttprequest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlserializer.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/domparser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_binding.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_css.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_debugwin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_dom.Plo ./$(DEPDIR)/kjs_events.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_html.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_mozilla.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_navigator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_proxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_range.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_traversal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_views.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_window.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlhttprequest.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlserializer.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkjs_html_la_SOURCES)
- DIST_SOURCES = $(libkjs_html_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -130,6 +178,8 @@
+--- khtml/html/Makefile.in
++++ khtml/html/Makefile.in
+@@ -131,6 +131,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -39791,7 +22623,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -171,8 +221,6 @@
+@@ -172,8 +174,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -39800,7 +22632,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -249,7 +297,6 @@
+@@ -250,7 +250,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -39808,7 +22640,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -286,6 +333,9 @@
+@@ -287,6 +286,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -39818,7 +22650,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,6 +391,7 @@
+@@ -342,6 +344,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -39826,16 +22658,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,8 +401,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -369,6 +418,7 @@
+@@ -370,6 +373,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -39843,7 +22666,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -552,7 +602,7 @@
+@@ -557,7 +561,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -39852,7 +22675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +640,9 @@
+@@ -595,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -39864,144 +22687,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -633,21 +683,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -759,7 +812,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- khtml/html/Makefile.in
-+++ khtml/html/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkhtmlhtml_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -93,24 +95,70 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dtd.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_baseimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_blockimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_documentimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_elementimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_formimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_headimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_imageimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_inlineimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_listimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_miscimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_objectimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_tableimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/htmlparser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/htmltokenizer.Plo
-+#>+ 30
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlhtml_la.all_cpp.P ./$(DEPDIR)/dtd.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_baseimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_blockimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_documentimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_elementimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_formimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_headimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_imageimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inlineimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_listimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_miscimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_objectimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_tableimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlparser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmltokenizer.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dtd.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_baseimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_blockimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_documentimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_elementimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_formimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_headimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_imageimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inlineimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_listimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_miscimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_objectimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_tableimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlparser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmltokenizer.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlhtml_la_SOURCES)
- DIST_SOURCES = $(libkhtmlhtml_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -131,6 +179,8 @@
+--- khtml/java/dummy/Makefile.in
++++ khtml/java/dummy/Makefile.in
+@@ -106,6 +106,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -40010,7 +22698,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -172,8 +222,6 @@
+@@ -147,8 +149,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -40019,7 +22707,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -250,7 +298,6 @@
+@@ -225,7 +225,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -40027,7 +22715,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -287,6 +334,9 @@
+@@ -262,6 +261,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -40037,7 +22725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,6 +392,7 @@
+@@ -317,6 +319,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -40045,16 +22733,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -351,8 +402,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -370,6 +419,7 @@
+@@ -345,6 +348,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -40062,7 +22741,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -557,7 +607,7 @@
+@@ -510,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -40071,7 +22750,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +645,9 @@
+@@ -548,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -40081,138 +22760,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -637,21 +687,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -762,7 +815,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- khtml/java/Makefile.in
+++ khtml/java/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES = kjava.policy
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kjavadatadir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kjavadatadir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -93,24 +88,46 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kjavaapplet.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletcontext.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletserver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletviewer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavadownloader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaprocess.Plo
-+#>+ 14
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kjavaappletviewer_la.all_cpp.P $(DEPDIR)/libkjava_la.all_cpp.P ./$(DEPDIR)/kjavaapplet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletcontext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletviewer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavadownloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaprocess.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kjavaapplet.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletcontext.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletviewer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavadownloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaprocess.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
- DIST_SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -148,6 +165,8 @@
+@@ -148,6 +148,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -40221,7 +22773,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -189,8 +208,6 @@
+@@ -189,8 +191,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -40230,7 +22782,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -267,7 +284,6 @@
+@@ -267,7 +267,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -40238,7 +22790,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -304,6 +320,9 @@
+@@ -304,6 +303,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -40248,7 +22800,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,6 +378,7 @@
+@@ -359,6 +361,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -40256,16 +22808,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,8 +388,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -387,6 +405,7 @@
+@@ -387,6 +390,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -40273,7 +22816,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -581,7 +600,7 @@
+@@ -581,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -40282,7 +22825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +638,9 @@
+@@ -619,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -40294,170 +22837,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
kjava.policy: $(top_builddir)/config.status $(srcdir)/kjava.policy.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -630,7 +649,7 @@
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -638,8 +657,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -690,21 +709,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -721,7 +743,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -729,7 +751,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -738,7 +760,7 @@
- test -z "$(kjavadatadir)" || $(mkdir_p) "$(DESTDIR)$(kjavadatadir)"
- @list='$(kjavadata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kjavadataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kjavadatadir)/$$f'"; \
- $(kjavadataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kjavadatadir)/$$f"; \
- done
-@@ -746,7 +768,7 @@
- uninstall-kjavadataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kjavadata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kjavadatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kjavadatadir)/$$f"; \
- done
-@@ -758,13 +780,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -776,7 +792,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -784,13 +800,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -811,7 +821,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -910,17 +920,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -952,7 +960,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1070,13 +1078,6 @@
+@@ -1070,13 +1074,6 @@
mocs: kjavaapplet.moc
#>+ 3
@@ -40471,7 +22851,7 @@
kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
-@@ -1084,11 +1085,11 @@
+@@ -1084,11 +1081,11 @@
mocs: kjavaappletserver.moc
#>+ 3
@@ -40486,7 +22866,7 @@
#>+ 3
kjavaprocess.moc: $(srcdir)/kjavaprocess.h
-@@ -1098,6 +1099,13 @@
+@@ -1098,6 +1095,13 @@
mocs: kjavaprocess.moc
#>+ 3
@@ -40500,7 +22880,7 @@
kjavaappletviewer.moc: $(srcdir)/kjavaappletviewer.h
$(MOC) $(srcdir)/kjavaappletviewer.h -o kjavaappletviewer.moc
-@@ -1115,7 +1123,7 @@
+@@ -1115,7 +1119,7 @@
#>+ 3
clean-metasources:
@@ -40509,7 +22889,7 @@
#>+ 2
KDE_DIST=KJAS_GRAMMAR.txt kjava.jar pluginsinfo Makefile.in kjava.policy.in configure.in.in kjavadownloader.h kxeventutil.cpp make-jar kqeventutil.cpp build.xml kjavaappletviewer.desktop build.properties Makefile.am cr16-action-java.png
-@@ -1174,7 +1182,7 @@
+@@ -1174,7 +1178,7 @@
#>+ 11
@@ -40518,7 +22898,7 @@
@echo 'creating kjavaappletviewer_la.all_cpp.cpp ...'; \
rm -f kjavaappletviewer_la.all_cpp.files kjavaappletviewer_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kjavaappletviewer_la.all_cpp.final; \
-@@ -1186,7 +1194,7 @@
+@@ -1186,7 +1190,7 @@
rm -f kjavaappletviewer_la.all_cpp.final kjavaappletviewer_la.all_cpp.files
#>+ 11
@@ -40527,7 +22907,7 @@
@echo 'creating libkjava_la.all_cpp.cpp ...'; \
rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
-@@ -1226,8 +1234,8 @@
+@@ -1226,8 +1230,8 @@
kjavaappletcontext.lo: kjavaappletcontext.moc
kjavaprocess.o: kjavaprocess.moc
kjavaappletserver.o: kjavaappletserver.moc
@@ -40537,77 +22917,9 @@
kjavadownloader.lo: kjavadownloader.moc
kjavaapplet.lo: kjavaapplet.moc
nmcheck:
---- khtml/java/dummy/Makefile.in
-+++ khtml/java/dummy/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(libkjava_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -52,12 +54,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -69,24 +65,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkjava_la_SOURCES)
- DIST_SOURCES = $(libkjava_la_SOURCES)
- ETAGS = etags
-@@ -106,6 +105,8 @@
+--- khtml/java/tests/Makefile.in
++++ khtml/java/tests/Makefile.in
+@@ -97,6 +97,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -40616,7 +22928,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -147,8 +148,6 @@
+@@ -138,8 +140,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -40625,7 +22937,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -225,7 +224,6 @@
+@@ -216,7 +216,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -40633,7 +22945,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -262,6 +260,9 @@
+@@ -253,6 +252,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -40643,7 +22955,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -317,6 +318,7 @@
+@@ -308,6 +310,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -40651,16 +22963,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -326,8 +328,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -345,6 +345,7 @@
+@@ -336,6 +339,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -40668,7 +22971,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -510,7 +511,7 @@
+@@ -504,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -40677,7 +22980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -548,16 +549,16 @@
+@@ -542,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -40687,122 +22990,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -565,8 +566,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -594,21 +595,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -722,7 +726,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- khtml/java/tests/Makefile.in
-+++ khtml/java/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(testserver_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -60,24 +62,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/testkjavaappletserver.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testkjavaappletserver.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(testserver_SOURCES)
- DIST_SOURCES = $(testserver_SOURCES)
- ETAGS = etags
-@@ -97,6 +102,8 @@
+ clean-checkPROGRAMS:
+--- khtml/kmultipart/Makefile.in
++++ khtml/kmultipart/Makefile.in
+@@ -110,6 +110,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -40811,7 +23003,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -138,8 +145,6 @@
+@@ -151,8 +153,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -40820,7 +23012,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -216,7 +221,6 @@
+@@ -229,7 +229,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -40828,7 +23020,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -253,6 +257,9 @@
+@@ -266,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -40838,7 +23030,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,6 +315,7 @@
+@@ -321,6 +323,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -40846,16 +23038,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -317,8 +325,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -336,6 +342,7 @@
+@@ -349,6 +352,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -40863,7 +23046,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -504,7 +511,7 @@
+@@ -526,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -40872,7 +23055,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +549,9 @@
+@@ -564,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -40882,119 +23065,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-checkPROGRAMS:
-@@ -569,21 +576,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -695,7 +705,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- khtml/kmultipart/Makefile.in
-+++ khtml/kmultipart/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkmultipart_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -71,24 +66,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmultipart.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmultipart.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmultipart_la_SOURCES)
- DIST_SOURCES = $(libkmultipart_la_SOURCES)
- kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -110,6 +108,8 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- khtml/Makefile.in
++++ khtml/Makefile.in
+@@ -213,6 +213,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -41003,7 +23078,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -151,8 +151,6 @@
+@@ -254,8 +256,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -41012,7 +23087,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -229,7 +227,6 @@
+@@ -332,7 +332,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -41020,7 +23095,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -266,6 +263,9 @@
+@@ -369,6 +368,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -41030,7 +23105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -321,6 +321,7 @@
+@@ -424,6 +426,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -41038,16 +23113,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -330,8 +331,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -349,6 +348,7 @@
+@@ -452,6 +455,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -41055,16 +23121,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -526,7 +526,7 @@
+@@ -689,7 +693,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 .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*) \
-@@ -564,16 +564,16 @@
+@@ -727,9 +731,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41076,151 +23142,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -581,8 +581,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -613,21 +613,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -644,7 +647,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -652,7 +655,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -758,7 +761,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- khtml/misc/Makefile.in
+++ khtml/misc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkhtmlmisc_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -88,24 +90,40 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/arena.Plo ./$(DEPDIR)/decoder.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/guess_ja.Plo ./$(DEPDIR)/helper.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/htmlhashes.Plo ./$(DEPDIR)/loader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/loader_jpeg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/stringit.Plo
-+#>+ 10
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlmisc_la.all_cpp.P ./$(DEPDIR)/arena.Plo ./$(DEPDIR)/decoder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/guess_ja.Plo ./$(DEPDIR)/helper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlhashes.Plo ./$(DEPDIR)/loader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/loader_jpeg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/stringit.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/arena.Plo ./$(DEPDIR)/decoder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/guess_ja.Plo ./$(DEPDIR)/helper.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlhashes.Plo ./$(DEPDIR)/loader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/loader_jpeg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/stringit.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlmisc_la_SOURCES)
- DIST_SOURCES = $(libkhtmlmisc_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -126,6 +144,8 @@
+@@ -126,6 +126,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -41229,7 +23153,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -167,8 +187,6 @@
+@@ -167,8 +169,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -41238,7 +23162,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -245,7 +263,6 @@
+@@ -245,7 +245,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -41246,7 +23170,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -282,6 +299,9 @@
+@@ -282,6 +281,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -41256,7 +23180,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -337,6 +357,7 @@
+@@ -337,6 +339,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -41264,16 +23188,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -346,8 +367,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -365,6 +384,7 @@
+@@ -365,6 +368,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -41281,7 +23196,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -544,7 +564,7 @@
+@@ -544,7 +548,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -41290,7 +23205,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +602,9 @@
+@@ -582,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41302,57 +23217,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -617,21 +637,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -742,7 +765,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- khtml/pics/Makefile.in
+++ khtml/pics/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -41397,16 +23263,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -41414,7 +23271,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -480,7 +482,7 @@
+@@ -480,7 +484,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -41423,7 +23280,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +520,9 @@
+@@ -518,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41435,16 +23292,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -589,7 +591,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -672,41 +674,41 @@
+@@ -672,41 +676,41 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions
$(INSTALL_DATA) $(srcdir)/cr16-action-wallet_open.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
@@ -41504,138 +23352,7 @@
force-reedit:
--- khtml/rendering/Makefile.in
+++ khtml/rendering/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkhtmlrender_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -101,24 +103,103 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/bidi.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/break_lines.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/counter_tree.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/enumerate.Plo ./$(DEPDIR)/font.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_arena.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_block.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_body.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_box.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_br.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_canvas.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_container.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_flow.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_form.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_frames.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_generated.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_image.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_inline.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_layer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_line.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_list.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_replaced.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_style.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_table.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_text.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/table_layout.Plo
-+#>+ 52
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlrender_la.all_cpp.P ./$(DEPDIR)/bidi.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/break_lines.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/counter_tree.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/enumerate.Plo ./$(DEPDIR)/font.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_arena.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_block.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_body.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_box.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_br.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_canvas.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_container.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_flow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_form.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_frames.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_generated.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_image.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_inline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_layer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_line.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_list.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_replaced.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_style.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_table.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_text.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/table_layout.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/bidi.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/break_lines.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/counter_tree.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/enumerate.Plo ./$(DEPDIR)/font.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_arena.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_block.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_body.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_box.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_br.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_canvas.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_container.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_flow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_form.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_frames.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_generated.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_image.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_inline.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_layer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_line.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_list.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_replaced.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_style.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_table.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_text.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/table_layout.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlrender_la_SOURCES)
- DIST_SOURCES = $(libkhtmlrender_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -139,6 +220,8 @@
+@@ -139,6 +139,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -41644,7 +23361,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -180,8 +263,6 @@
+@@ -180,8 +182,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -41653,7 +23370,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -258,7 +339,6 @@
+@@ -258,7 +258,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -41661,7 +23378,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -295,6 +375,9 @@
+@@ -295,6 +294,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -41671,7 +23388,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -350,6 +433,7 @@
+@@ -350,6 +352,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -41679,16 +23396,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -359,8 +443,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -378,6 +460,7 @@
+@@ -378,6 +381,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -41696,7 +23404,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -566,7 +649,7 @@
+@@ -566,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -41705,7 +23413,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +687,9 @@
+@@ -604,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41717,44 +23425,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -658,21 +741,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -783,7 +869,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -868,18 +954,18 @@
+@@ -868,18 +872,18 @@
.NOEXPORT:
#>+ 3
@@ -41779,7 +23450,7 @@
#>+ 3
render_frames.moc: $(srcdir)/render_frames.h
-@@ -897,7 +983,7 @@
+@@ -897,7 +901,7 @@
#>+ 3
clean-metasources:
@@ -41788,7 +23459,7 @@
#>+ 2
KDE_DIST=render_inline.h render_block.h img-loading.png table_layout.txt Makefile.in counter_tree.h render_applet.cpp render_body.h render_image.h loading_icon.cpp Makefile.am
-@@ -944,7 +1030,7 @@
+@@ -944,7 +948,7 @@
#>+ 11
@@ -41797,7 +23468,7 @@
@echo 'creating libkhtmlrender_la.all_cpp.cpp ...'; \
rm -f libkhtmlrender_la.all_cpp.files libkhtmlrender_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkhtmlrender_la.all_cpp.final; \
-@@ -986,7 +1072,7 @@
+@@ -986,7 +990,7 @@
render_replaced.o: render_replaced.moc
nmcheck-am: nmcheck
render_replaced.lo: render_replaced.moc
@@ -41808,93 +23479,7 @@
render_layer.lo: render_layer.moc
--- khtml/xml/Makefile.in
+++ khtml/xml/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkhtmlxml_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -91,24 +93,58 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dom2_eventsimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_rangeimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversalimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_viewsimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_docimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_elementimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_nodeimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_stringimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_textimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_xmlimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/xml_tokenizer.Plo
-+#>+ 22
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlxml_la.all_cpp.P ./$(DEPDIR)/dom2_eventsimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_rangeimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversalimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_viewsimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_docimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_elementimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_nodeimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_stringimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_textimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_xmlimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xml_tokenizer.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dom2_eventsimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_rangeimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversalimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_viewsimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_docimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_elementimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_nodeimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_stringimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_textimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_xmlimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xml_tokenizer.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlxml_la_SOURCES)
- DIST_SOURCES = $(libkhtmlxml_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -129,6 +165,8 @@
+@@ -129,6 +129,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -41903,7 +23488,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -170,8 +208,6 @@
+@@ -170,8 +172,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -41912,7 +23497,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -248,7 +284,6 @@
+@@ -248,7 +248,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -41920,7 +23505,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -285,6 +320,9 @@
+@@ -285,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -41930,7 +23515,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,6 +378,7 @@
+@@ -340,6 +342,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -41938,16 +23523,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -349,8 +388,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -368,6 +405,7 @@
+@@ -368,6 +371,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -41955,7 +23531,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -552,7 +590,7 @@
+@@ -552,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -41964,7 +23540,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +628,9 @@
+@@ -590,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41976,156 +23552,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -628,21 +666,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -753,7 +794,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kimgio/Makefile.in
+++ kimgio/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) $(kimg_exr_la_SOURCES) $(kimg_hdr_la_SOURCES) $(kimg_ico_la_SOURCES) $(kimg_jp2_la_SOURCES) $(kimg_pcx_la_SOURCES) $(kimg_psd_la_SOURCES) $(kimg_rgb_la_SOURCES) $(kimg_tga_la_SOURCES) $(kimg_tiff_la_SOURCES) $(kimg_xcf_la_SOURCES) $(kimg_xview_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,14 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -83,8 +78,6 @@
- #>- kimg_exr_la_OBJECTS = $(am_kimg_exr_la_OBJECTS)
- #>+ 1
- kimg_exr_la_OBJECTS = exr.lo
-- at include_EXR_MODULES_TRUE@am_kimg_exr_la_rpath = -rpath \
-- at include_EXR_MODULES_TRUE@ $(kde_moduledir)
- kimg_hdr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_kimg_hdr_la_OBJECTS = hdr.lo
- #>- kimg_hdr_la_OBJECTS = $(am_kimg_hdr_la_OBJECTS)
-@@ -101,8 +94,6 @@
- #>- kimg_jp2_la_OBJECTS = $(am_kimg_jp2_la_OBJECTS)
- #>+ 1
- kimg_jp2_la_OBJECTS = jp2.lo
-- at include_JP2_MODULES_TRUE@am_kimg_jp2_la_rpath = -rpath \
-- at include_JP2_MODULES_TRUE@ $(kde_moduledir)
- kimg_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_kimg_pcx_la_OBJECTS = pcx.lo
- #>- kimg_pcx_la_OBJECTS = $(am_kimg_pcx_la_OBJECTS)
-@@ -129,8 +120,6 @@
- #>- kimg_tiff_la_OBJECTS = $(am_kimg_tiff_la_OBJECTS)
- #>+ 1
- kimg_tiff_la_OBJECTS = tiffr.lo
-- at include_TIFF_MODULES_TRUE@am_kimg_tiff_la_rpath = -rpath \
-- at include_TIFF_MODULES_TRUE@ $(kde_moduledir)
- kimg_xcf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_kimg_xcf_la_OBJECTS = xcf.lo
- #>- kimg_xcf_la_OBJECTS = $(am_kimg_xcf_la_OBJECTS)
-@@ -144,24 +133,39 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dds.Plo ./$(DEPDIR)/eps.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/exr.Plo ./$(DEPDIR)/hdr.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ico.Plo ./$(DEPDIR)/jp2.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/pcx.Plo ./$(DEPDIR)/psd.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/rgb.Plo ./$(DEPDIR)/tga.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/tiffr.Plo ./$(DEPDIR)/xcf.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/xview.Plo
-+#>+ 7
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dds.Plo ./$(DEPDIR)/eps.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exr.Plo ./$(DEPDIR)/hdr.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ico.Plo ./$(DEPDIR)/jp2.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pcx.Plo ./$(DEPDIR)/psd.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rgb.Plo ./$(DEPDIR)/tga.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tiffr.Plo ./$(DEPDIR)/xcf.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xview.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) \
- $(kimg_exr_la_SOURCES) $(kimg_hdr_la_SOURCES) \
- $(kimg_ico_la_SOURCES) $(kimg_jp2_la_SOURCES) \
-@@ -196,6 +200,8 @@
+@@ -196,6 +196,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -42134,7 +23563,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -237,8 +243,6 @@
+@@ -237,8 +239,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -42143,7 +23572,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -315,7 +319,6 @@
+@@ -315,7 +315,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -42151,7 +23580,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -352,6 +355,9 @@
+@@ -352,6 +351,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -42161,7 +23590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,6 +413,7 @@
+@@ -407,6 +409,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -42169,16 +23598,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +423,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -435,6 +440,7 @@
+@@ -435,6 +438,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -42186,7 +23606,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -688,7 +694,7 @@
+@@ -688,7 +692,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -42195,7 +23615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -726,16 +732,16 @@
+@@ -726,9 +730,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42207,230 +23627,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -743,8 +749,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -771,7 +777,7 @@
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kimg_exr.la: kimg_exr.la.closure $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES)
- @KDE_USE_CLOSURE_FALSE at kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES)
-- $(CXXLINK) $(am_kimg_exr_la_rpath) $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
-+ $(CXXLINK) -rpath $(kde_moduledir) $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
- #>- kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES)
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kimg_hdr.la: kimg_hdr.la.closure $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES)
-@@ -786,7 +792,7 @@
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kimg_jp2.la: kimg_jp2.la.closure $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES)
- @KDE_USE_CLOSURE_FALSE at kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES)
-- $(CXXLINK) $(am_kimg_jp2_la_rpath) $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
-+ $(CXXLINK) -rpath $(kde_moduledir) $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
- #>- kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES)
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kimg_pcx.la: kimg_pcx.la.closure $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES)
-@@ -811,7 +817,7 @@
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kimg_tiff.la: kimg_tiff.la.closure $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES)
- @KDE_USE_CLOSURE_FALSE at kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES)
-- $(CXXLINK) $(am_kimg_tiff_la_rpath) $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
-+ $(CXXLINK) -rpath $(kde_moduledir) $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
- #>- kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES)
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at kimg_xcf.la: kimg_xcf.la.closure $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES)
-@@ -847,21 +853,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -878,7 +887,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -886,7 +895,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -993,7 +1002,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kinit/Makefile.in
+++ kinit/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,10 @@
-
-
-
-+#>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) $(kshell_SOURCES) $(kstartupconfig_SOURCES) $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
-+#>+ 1
-+SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) $(kshell_SOURCES) $(kstartupconfig_SOURCES) $(kwrapper_SOURCES) $(lnusertemp_SOURCES) $(klauncher_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -76,14 +80,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -153,43 +150,65 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/autostart.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdostartupconfig.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstartupconfig.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po
-+#>+ 18
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/klauncher.la.Po $(DEPDIR)/klauncher_dummy.Plo $(DEPDIR)/libkdeinit_klauncher_la.all_cpp.P $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P ./$(DEPDIR)/autostart.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdostartupconfig.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupconfig.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/klauncher.la.Po $(DEPDIR)/klauncher_dummy.Plo ./$(DEPDIR)/autostart.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdostartupconfig.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupconfig.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
--#>- $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
--#>- $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
--#>- $(kshell_SOURCES) $(kstartupconfig_SOURCES) \
--#>- $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
--#>+ 5
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
- $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
- $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
- $(kshell_SOURCES) $(kstartupconfig_SOURCES) \
-- $(kwrapper_SOURCES) $(lnusertemp_SOURCES) $(klauncher_SOURCES)
-+ $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
- #>- DIST_SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
- #>- $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
- #>- $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
-@@ -233,6 +252,8 @@
+@@ -233,6 +233,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -42439,7 +23638,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -274,8 +295,6 @@
+@@ -274,8 +276,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -42448,7 +23647,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -352,7 +371,6 @@
+@@ -352,7 +352,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -42456,7 +23655,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -389,6 +407,9 @@
+@@ -389,6 +388,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -42466,7 +23665,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,6 +465,7 @@
+@@ -444,6 +446,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -42474,16 +23673,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -453,8 +475,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -472,6 +492,7 @@
+@@ -472,6 +475,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -42491,7 +23681,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -679,7 +700,7 @@
+@@ -679,7 +683,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -42500,7 +23690,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -717,16 +738,16 @@
+@@ -717,9 +721,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42512,237 +23702,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -734,8 +755,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -753,7 +774,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -761,8 +782,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -856,42 +877,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -911,13 +938,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -929,7 +950,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -937,13 +958,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -964,7 +979,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1064,17 +1079,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1108,7 +1121,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kinit/tests/Makefile.in
+++ kinit/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
- # $Id: Makefile.am 157691 2002-05-25 18:00:11Z coolo $
-+SOURCES = $(klaunchertest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -63,24 +65,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/klaunchertest.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/klaunchertest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(klaunchertest_SOURCES)
- DIST_SOURCES = $(klaunchertest_SOURCES)
- ETAGS = etags
-@@ -100,6 +105,8 @@
+@@ -100,6 +100,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -42751,7 +23713,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -141,8 +148,6 @@
+@@ -141,8 +143,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -42760,7 +23722,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -219,7 +224,6 @@
+@@ -219,7 +219,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -42768,7 +23730,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -256,6 +260,9 @@
+@@ -256,6 +255,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -42778,7 +23740,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -311,6 +318,7 @@
+@@ -311,6 +313,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -42786,16 +23748,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -320,8 +328,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -339,6 +345,7 @@
+@@ -339,6 +342,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -42803,7 +23756,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -504,7 +511,7 @@
+@@ -504,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -42812,7 +23765,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +549,9 @@
+@@ -542,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42824,537 +23777,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -569,21 +576,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -695,7 +705,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kio/Makefile.in
-+++ kio/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
-
-
-
-+SOURCES = $(libkio_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,16 +75,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(updatedir)" \
-- "$(DESTDIR)$(dataprotocoldir)" "$(DESTDIR)$(kde_mimedir)" \
-- "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kdeddir)" \
-- "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(dataprotocoldir)" "$(DESTDIR)$(kde_mimedir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -101,24 +94,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkio_la_SOURCES)
- DIST_SOURCES = $(libkio_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -160,6 +156,8 @@
- AUTODIRS = @AUTODIRS@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-+AVAHI_CFLAGS = @AVAHI_CFLAGS@
-+AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -201,8 +199,6 @@
- GSSAPI_INCS = @GSSAPI_INCS@
- GSSAPI_LIBS = @GSSAPI_LIBS@
- GSSAPI_RPATH = @GSSAPI_RPATH@
--HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
--HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- HAVE_MITSHM = @HAVE_MITSHM@
- HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -279,7 +275,6 @@
- LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_CUPS = @LIB_CUPS@
--LIB_DNSSD = @LIB_DNSSD@
- LIB_EXR = @LIB_EXR@
- LIB_IDN = @LIB_IDN@
- LIB_JASPER = @LIB_JASPER@
-@@ -316,6 +311,9 @@
- LUA = @LUA@
- LUA_INCLUDES = @LUA_INCLUDES@
- LUA_LIBS = @LUA_LIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -371,6 +369,7 @@
- ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,8 +379,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -399,6 +396,7 @@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+have_pkg_config = @have_pkg_config@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -595,7 +593,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -633,16 +631,16 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -650,8 +648,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -701,21 +699,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -732,7 +733,7 @@
- test -z "$(dataprotocoldir)" || $(mkdir_p) "$(DESTDIR)$(dataprotocoldir)"
- @list='$(dataprotocol_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dataprotocolDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dataprotocoldir)/$$f'"; \
- $(dataprotocolDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dataprotocoldir)/$$f"; \
- done
-@@ -740,7 +741,7 @@
- uninstall-dataprotocolDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dataprotocol_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(dataprotocoldir)/$$f'"; \
- rm -f "$(DESTDIR)$(dataprotocoldir)/$$f"; \
- done
-@@ -749,7 +750,7 @@
- test -z "$(kde_mimedir)" || $(mkdir_p) "$(DESTDIR)$(kde_mimedir)"
- @list='$(kde_mime_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_mimeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_mimedir)/$$f'"; \
- $(kde_mimeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_mimedir)/$$f"; \
- done
-@@ -757,7 +758,7 @@
- uninstall-kde_mimeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_mime_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_mimedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_mimedir)/$$f"; \
- done
-@@ -766,7 +767,7 @@
- test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -774,7 +775,7 @@
- uninstall-kde_servicetypesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -783,7 +784,7 @@
- test -z "$(kdeddir)" || $(mkdir_p) "$(DESTDIR)$(kdeddir)"
- @list='$(kded_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeddir)/$$f'"; \
- $(kdedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeddir)/$$f"; \
- done
-@@ -791,7 +792,7 @@
- uninstall-kdedDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kded_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdeddir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdeddir)/$$f"; \
- done
-@@ -800,7 +801,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -808,7 +809,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -817,7 +818,7 @@
- test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
- @list='$(update_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
- $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -825,7 +826,7 @@
- uninstall-updateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(update_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -837,13 +838,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -855,7 +850,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -863,13 +858,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -890,7 +879,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -990,17 +979,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1032,7 +1019,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/bookmarks/Makefile.in
+++ kio/bookmarks/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkbookmarks_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -94,32 +96,66 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbookmark.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdombuilder.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdrag.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkexporter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_crash.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ie.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_kde1.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ns.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_opera.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmenu.Plo
-+#>+ 26
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kbookmarkmanager_skel.P $(DEPDIR)/kbookmarknotifier_skel.P $(DEPDIR)/libkbookmarks_la.all_cc.P ./$(DEPDIR)/kbookmark.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdombuilder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkexporter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_crash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ie.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_kde1.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ns.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_opera.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmenu.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kbookmarkmanager_skel.P $(DEPDIR)/kbookmarknotifier_skel.P ./$(DEPDIR)/kbookmark.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdombuilder.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdrag.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkexporter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_crash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ie.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_kde1.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ns.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_opera.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmenu.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkbookmarks_la_SOURCES)
- DIST_SOURCES = $(libkbookmarks_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(includedir)"
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS)
-@@ -140,6 +176,8 @@
+@@ -140,6 +140,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -43363,7 +23788,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -181,8 +219,6 @@
+@@ -181,8 +183,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -43372,7 +23797,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -259,7 +295,6 @@
+@@ -259,7 +259,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -43380,7 +23805,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -296,6 +331,9 @@
+@@ -296,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -43390,7 +23815,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -351,6 +389,7 @@
+@@ -351,6 +353,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -43398,16 +23823,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,8 +399,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -379,6 +416,7 @@
+@@ -379,6 +382,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -43415,7 +23831,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -566,7 +604,7 @@
+@@ -566,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -43424,7 +23840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +642,9 @@
+@@ -604,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43436,119 +23852,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -644,21 +682,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -675,7 +716,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -683,7 +724,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -790,7 +831,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/httpfilter/Makefile.in
+++ kio/httpfilter/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(libhttpfilter_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -63,24 +65,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/httpfilter.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/httpfilter.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libhttpfilter_la_SOURCES)
- DIST_SOURCES = $(libhttpfilter_la_SOURCES)
- ETAGS = etags
-@@ -100,6 +105,8 @@
+@@ -100,6 +100,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -43557,7 +23863,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -141,8 +148,6 @@
+@@ -141,8 +143,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -43566,7 +23872,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -219,7 +224,6 @@
+@@ -219,7 +219,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -43574,7 +23880,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -256,6 +260,9 @@
+@@ -256,6 +255,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -43584,7 +23890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -311,6 +318,7 @@
+@@ -311,6 +313,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -43592,16 +23898,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -320,8 +328,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -339,6 +345,7 @@
+@@ -339,6 +342,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -43609,7 +23906,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -507,7 +514,7 @@
+@@ -507,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -43618,7 +23915,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +552,9 @@
+@@ -545,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43630,218 +23927,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -573,21 +580,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -699,7 +709,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/kfile/Makefile.in
+++ kio/kfile/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
-
-
-
-+SOURCES = $(libkfile_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -108,34 +110,136 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kacleditwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcombiview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenueditor.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdiroperator.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirsize.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdiskfreesp.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kencodingfiledialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilebookmarkhandler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiledetailview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiledialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilefiltercombo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileiconview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfowidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetapreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilepreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilesharedlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilespeedbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreebranch.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewitem.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicondialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimagefilepreview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmetaprops.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifydialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kopenwith.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewprops.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewwidgetbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpropertiesdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krecentdirs.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krecentdocument.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlcombobox.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequester.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequesterdlg.Plo
-+#>+ 72
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/knotifywidgetbase.P $(DEPDIR)/kpropertiesdesktopbase.P $(DEPDIR)/kpropertiesdesktopadvbase.P $(DEPDIR)/kpropertiesmimetypebase.P $(DEPDIR)/libkfile_la.all_cpp.P ./$(DEPDIR)/kacleditwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombiview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenueditor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiroperator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirsize.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiskfreesp.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kencodingfiledialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilebookmarkhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledetailview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefiltercombo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileiconview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfowidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetapreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilepreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilesharedlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilespeedbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreebranch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimagefilepreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmetaprops.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifydialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwith.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewprops.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewwidgetbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpropertiesdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdirs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdocument.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcombobox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequester.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequesterdlg.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/knotifywidgetbase.P $(DEPDIR)/kpropertiesdesktopbase.P $(DEPDIR)/kpropertiesdesktopadvbase.P $(DEPDIR)/kpropertiesmimetypebase.P ./$(DEPDIR)/kacleditwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombiview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenueditor.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiroperator.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirsize.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiskfreesp.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kencodingfiledialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilebookmarkhandler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledetailview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefiltercombo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileiconview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfowidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetapreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilepreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilesharedlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilespeedbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreebranch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimagefilepreview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmetaprops.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifydialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwith.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewprops.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewwidgetbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpropertiesdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdirs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdocument.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcombobox.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequester.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequesterdlg.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkfile_la_SOURCES)
- DIST_SOURCES = $(libkfile_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(servicetype_DATA)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -157,6 +261,8 @@
+@@ -157,6 +157,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -43850,7 +23938,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -198,8 +304,6 @@
+@@ -198,8 +200,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -43859,7 +23947,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -276,7 +380,6 @@
+@@ -276,7 +276,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -43867,7 +23955,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -313,6 +416,9 @@
+@@ -313,6 +312,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -43877,7 +23965,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -368,6 +474,7 @@
+@@ -368,6 +370,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -43885,16 +23973,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,8 +484,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -396,6 +501,7 @@
+@@ -396,6 +399,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -43902,7 +23981,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -620,7 +726,7 @@
+@@ -620,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -43911,7 +23990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +764,9 @@
+@@ -658,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43923,80 +24002,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -721,21 +827,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -752,7 +861,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -760,7 +869,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -769,7 +878,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -777,7 +886,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -884,7 +993,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1093,18 +1202,18 @@
+@@ -1093,18 +1097,18 @@
mocs: kimagefilepreview.moc
#>+ 3
@@ -44021,7 +24027,7 @@
#>+ 3
kacleditwidget.moc: $(srcdir)/kacleditwidget.h
-@@ -1163,18 +1272,18 @@
+@@ -1163,18 +1167,18 @@
mocs: kfilefiltercombo.moc
#>+ 3
@@ -44046,7 +24052,7 @@
#>+ 3
kfiledialog.moc: $(srcdir)/kfiledialog.h
-@@ -1198,18 +1307,18 @@
+@@ -1198,18 +1202,18 @@
mocs: kfiledetailview.moc
#>+ 3
@@ -44071,7 +24077,7 @@
#>+ 3
kfilebookmarkhandler.moc: $(srcdir)/kfilebookmarkhandler.h
-@@ -1311,7 +1420,7 @@
+@@ -1311,7 +1315,7 @@
#>+ 3
clean-metasources:
@@ -44080,7 +24086,7 @@
#>+ 2
KDE_DIST=Makefile.in kpropsdlgplugin.desktop kpropertiesmimetypebase.ui kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui kfilemetapreview.h knotifywidgetbase.ui Makefile.am
-@@ -1366,7 +1475,7 @@
+@@ -1366,7 +1370,7 @@
#>+ 11
@@ -44091,87 +24097,7 @@
echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
--- kio/kfile/tests/Makefile.in
+++ kio/kfile/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -33,6 +33,8 @@
- # along with this library; see the file COPYING.LIB. If not, write to
- # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- # Boston, MA 02110-1301, USA.
-+SOURCES = $(kcustommenueditortest_SOURCES) $(kdirselectdialogtest_SOURCES) $(kfiletreeviewtest_SOURCES) $(kfstest_SOURCES) $(kicondialogtest_SOURCES) $(knotifytest_SOURCES) $(kopenwithtest_SOURCES) $(kurlrequestertest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -129,24 +131,52 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcustommenueditortest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialogtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfdtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicondialogtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kopenwithtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequestertest.Po
-+#>+ 18
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kfstest.all_cpp.P ./$(DEPDIR)/kcustommenueditortest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialogtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfdtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialogtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwithtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequestertest.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kcustommenueditortest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialogtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfdtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfstest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialogtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwithtest.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequestertest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcustommenueditortest_SOURCES) \
- $(kdirselectdialogtest_SOURCES) $(kfiletreeviewtest_SOURCES) \
- $(kfstest_SOURCES) $(kicondialogtest_SOURCES) \
-@@ -174,6 +204,8 @@
+@@ -174,6 +174,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -44180,7 +24106,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -215,8 +247,6 @@
+@@ -215,8 +217,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -44189,7 +24115,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -293,7 +323,6 @@
+@@ -293,7 +293,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -44197,7 +24123,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -330,6 +359,9 @@
+@@ -330,6 +329,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -44207,7 +24133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,6 +417,7 @@
+@@ -385,6 +387,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -44215,16 +24141,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,8 +427,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -413,6 +444,7 @@
+@@ -413,6 +416,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -44232,7 +24149,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -589,7 +621,7 @@
+@@ -589,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -44241,7 +24158,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +659,9 @@
+@@ -627,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44253,312 +24170,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -683,21 +715,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -809,7 +844,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/kio/Makefile.in
+++ kio/kio/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -131,42 +133,228 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/authinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/chmodjob.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/connection.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dataprotocol.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dataslave.Plo ./$(DEPDIR)/davjob.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/defaultprogress.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/forwardingslavebase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/job.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kacl.Plo ./$(DEPDIR)/kar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/karchive.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kautomount.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatatool.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdcopservicestarter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirlister.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify_stub.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatch.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kemailsettings.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilefilter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileitem.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileshare.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilterbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilterdev.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimageio.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagic.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimetype.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypechooser.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knfsshare.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolmanager.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kremoteencoding.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/krun.Plo ./$(DEPDIR)/ksambashare.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kscan.Plo ./$(DEPDIR)/kservice.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroup.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroupfactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicetype.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicetypefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshellcompletion.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshred.Plo ./$(DEPDIR)/ktar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktrader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparse.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparsetree.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurifilter.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletion.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlpixmapprovider.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuserprofile.Plo ./$(DEPDIR)/kzip.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lex.Plo ./$(DEPDIR)/metainfojob.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/netaccess.Plo ./$(DEPDIR)/observer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/passdlg.Plo ./$(DEPDIR)/paste.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/pastedialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/posixacladdons.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/previewjob.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/progressbase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/renamedlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/scheduler.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sessiondata.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/skipdlg.Plo ./$(DEPDIR)/slave.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/slavebase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/slaveconfig.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/slaveinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/statusbarprogress.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/tcpslavebase.Plo ./$(DEPDIR)/yacc.Plo
-+#>+ 128
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/observer_stub.P $(DEPDIR)/kdirnotify_skel.P $(DEPDIR)/uiserver_stub.P $(DEPDIR)/observer_skel.P $(DEPDIR)/libkiocore_la.all_cpp.P $(DEPDIR)/libksycoca_la.all_cpp.P ./$(DEPDIR)/authinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/chmodjob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/connection.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataprotocol.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataslave.Plo ./$(DEPDIR)/davjob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultprogress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/forwardingslavebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/job.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kacl.Plo ./$(DEPDIR)/kar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karchive.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kautomount.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatatool.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopservicestarter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirlister.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify_stub.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kemailsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefilter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileshare.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterdev.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagic.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetype.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypechooser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knfsshare.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kremoteencoding.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krun.Plo ./$(DEPDIR)/ksambashare.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscan.Plo ./$(DEPDIR)/kservice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroupfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetype.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetypefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshellcompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshred.Plo ./$(DEPDIR)/ktar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktrader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparse.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparsetree.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurifilter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlpixmapprovider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuserprofile.Plo ./$(DEPDIR)/kzip.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lex.Plo ./$(DEPDIR)/metainfojob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/netaccess.Plo ./$(DEPDIR)/observer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/passdlg.Plo ./$(DEPDIR)/paste.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pastedialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/posixacladdons.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewjob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/progressbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/renamedlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/scheduler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessiondata.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/skipdlg.Plo ./$(DEPDIR)/slave.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slavebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarprogress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tcpslavebase.Plo ./$(DEPDIR)/yacc.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/observer_stub.P $(DEPDIR)/kdirnotify_skel.P $(DEPDIR)/uiserver_stub.P $(DEPDIR)/observer_skel.P ./$(DEPDIR)/authinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/chmodjob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/connection.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataprotocol.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataslave.Plo ./$(DEPDIR)/davjob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultprogress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/forwardingslavebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/job.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kacl.Plo ./$(DEPDIR)/kar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karchive.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kautomount.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatatool.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopservicestarter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirlister.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify_stub.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatch.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kemailsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefilter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileitem.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileshare.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterdev.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageio.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagic.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetype.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypechooser.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knfsshare.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolmanager.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kremoteencoding.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krun.Plo ./$(DEPDIR)/ksambashare.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscan.Plo ./$(DEPDIR)/kservice.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroupfactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetype.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetypefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshellcompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshred.Plo ./$(DEPDIR)/ktar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktrader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparse.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparsetree.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurifilter.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletion.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlpixmapprovider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuserprofile.Plo ./$(DEPDIR)/kzip.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lex.Plo ./$(DEPDIR)/metainfojob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/netaccess.Plo ./$(DEPDIR)/observer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/passdlg.Plo ./$(DEPDIR)/paste.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pastedialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/posixacladdons.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewjob.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/progressbase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/renamedlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/scheduler.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessiondata.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/skipdlg.Plo ./$(DEPDIR)/slave.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slavebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveconfig.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarprogress.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tcpslavebase.Plo ./$(DEPDIR)/yacc.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
- DIST_SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(includedir)" \
-- "$(DESTDIR)$(kioincludedir)"
-+am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kioincludedir)"
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- kioincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS) $(kioinclude_HEADERS) $(noinst_HEADERS)
-@@ -187,6 +375,8 @@
+@@ -187,6 +187,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -44567,7 +24181,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -228,8 +418,6 @@
+@@ -228,8 +230,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -44576,7 +24190,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -306,7 +494,6 @@
+@@ -306,7 +306,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -44584,7 +24198,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -343,6 +530,9 @@
+@@ -343,6 +342,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -44594,7 +24208,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,6 +588,7 @@
+@@ -398,6 +400,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -44602,16 +24216,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +598,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -426,6 +615,7 @@
+@@ -426,6 +429,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -44619,90 +24224,8 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -588,32 +778,40 @@
+@@ -693,7 +697,7 @@
- # convenience lib - no LDFLAGS or LIBADD !
- #if USE_POSIX_ACL
--libksycoca_la_SOURCES = kdirwatch.cpp kfileshare.cpp ksambashare.cpp \
-- knfsshare.cpp ktrader.cpp ktraderparse.cpp \
-- ktraderparsetree.cpp kservicetypefactory.cpp kservicetype.cpp \
-- kmimetype.cpp kservicegroup.cpp kservice.cpp \
-- kservicefactory.cpp kuserprofile.cpp kservicegroupfactory.cpp \
-- kurifilter.cpp kfilterbase.cpp kfilterdev.cpp \
-- kshellcompletion.cpp kurlcompletion.cpp kautomount.cpp \
-- krun.cpp kfileitem.cpp kdirlister.cpp kimageio.cpp yacc.c \
-- lex.c chmodjob.cpp kscan.cpp kar.cpp ktar.cpp kzip.cpp \
-- previewjob.cpp metainfojob.cpp davjob.cpp kdatatool.cpp \
-- karchive.cpp kfilefilter.cpp kfilemetainfo.cpp \
-- kdcopservicestarter.cpp dataslave.cpp dataprotocol.cpp \
-- kacl.cpp posixacladdons.cpp
-+libksycoca_la_SOURCES = \
-+ kdirwatch.cpp \
-+ kfileshare.cpp ksambashare.cpp knfsshare.cpp \
-+ ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
-+ kservicetypefactory.cpp kservicetype.cpp \
-+ kmimetype.cpp kservicegroup.cpp \
-+ kservice.cpp kservicefactory.cpp \
-+ kuserprofile.cpp kservicegroupfactory.cpp \
-+ kurifilter.cpp \
-+ kfilterbase.cpp kfilterdev.cpp \
-+ kshellcompletion.cpp kurlcompletion.cpp \
-+ kautomount.cpp krun.cpp \
-+ kfileitem.cpp kdirlister.cpp kimageio.cpp \
-+ yacc.c lex.c \
-+ chmodjob.cpp kscan.cpp kar.cpp ktar.cpp kzip.cpp previewjob.cpp metainfojob.cpp davjob.cpp \
-+ kdatatool.cpp karchive.cpp kfilefilter.cpp \
-+ kfilemetainfo.cpp kdcopservicestarter.cpp \
-+ dataslave.cpp dataprotocol.cpp \
-+kacl.cpp posixacladdons.cpp
- #endif
- #if USE_POSIX_ACL
--include_HEADERS = kservicetype.h kmimetype.h kmimemagic.h kservice.h \
-- krun.h kdirwatch.h kautomount.h kuserprofile.h kshred.h kar.h \
-- ktar.h kzip.h ktrader.h kurifilter.h kurlcompletion.h \
-- kshellcompletion.h kfileitem.h kfileshare.h ksambashare.h \
-- knfsshare.h kdirlister.h kservicegroup.h kimageio.h \
-- kdirnotify.h kdirnotify_stub.h kurlpixmapprovider.h \
-- kprotocolinfo.h kprotocolmanager.h kfilterbase.h kfilterdev.h \
-- kemailsettings.h kscan.h kdatatool.h karchive.h kfilefilter.h \
-- kfilemetainfo.h renamedlgplugin.h kmimetyperesolver.h \
-- kdcopservicestarter.h kremoteencoding.h kmimetypechooser.h \
-- kacl.h
-+include_HEADERS = \
-+ kservicetype.h kmimetype.h kmimemagic.h kservice.h \
-+ krun.h kdirwatch.h kautomount.h kuserprofile.h \
-+ kshred.h kar.h ktar.h kzip.h ktrader.h kurifilter.h kurlcompletion.h \
-+ kshellcompletion.h kfileitem.h kfileshare.h ksambashare.h knfsshare.h \
-+ kdirlister.h kservicegroup.h \
-+ kimageio.h kdirnotify.h kdirnotify_stub.h \
-+ kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
-+ kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
-+ karchive.h kfilefilter.h kfilemetainfo.h renamedlgplugin.h \
-+ kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
-+ kmimetypechooser.h \
-+kacl.h
- #endif
-
- #libkiocore_la_LDFLAGS = $(all_libraries)
-@@ -680,10 +878,12 @@
- # Internal
- #if USE_POSIX_ACL
- noinst_HEADERS = kservicetypefactory.h kservicefactory.h \
-- kmessageboxwrapper.h ktraderparse.h ktraderparsetree.h yacc.h \
-- kimageiofactory.h kdirwatch_p.h kdirlister_p.h renamedlg.h \
-- skipdlg.h dataslave.h dataprotocol.h kservice_p.h \
-- posixacladdons.h
-+ kmessageboxwrapper.h \
-+ ktraderparse.h ktraderparsetree.h yacc.h \
-+ kimageiofactory.h kdirwatch_p.h kdirlister_p.h \
-+ renamedlg.h skipdlg.h dataslave.h dataprotocol.h \
-+ kservice_p.h\
-+posixacladdons.h
- #endif
- parserfiles = yacc.y lex.l
- EXTRA_DIST = $(parserfiles)
-@@ -693,7 +893,7 @@
-
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
@@ -44710,7 +24233,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -731,9 +931,9 @@
+@@ -731,9 +735,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44722,107 +24245,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -836,42 +1036,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -888,7 +1094,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -896,7 +1102,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -905,7 +1111,7 @@
- test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
- @list='$(kioinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kioincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kioincludedir)/$$f'"; \
- $(kioincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kioincludedir)/$$f"; \
- done
-@@ -913,7 +1119,7 @@
- uninstall-kioincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kioinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kioincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kioincludedir)/$$f"; \
- done
-@@ -1020,7 +1226,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1266,13 +1472,6 @@
+@@ -1266,13 +1270,6 @@
mocs: slave.moc
#>+ 3
@@ -44836,7 +24259,7 @@
kshred.moc: $(srcdir)/kshred.h
$(MOC) $(srcdir)/kshred.h -o kshred.moc
-@@ -1280,11 +1479,11 @@
+@@ -1280,11 +1277,11 @@
mocs: kshred.moc
#>+ 3
@@ -44851,7 +24274,7 @@
#>+ 3
kurifilter.moc: $(srcdir)/kurifilter.h
-@@ -1294,6 +1493,13 @@
+@@ -1294,6 +1291,13 @@
mocs: kurifilter.moc
#>+ 3
@@ -44865,7 +24288,7 @@
defaultprogress.moc: $(srcdir)/defaultprogress.h
$(MOC) $(srcdir)/defaultprogress.h -o defaultprogress.moc
-@@ -1406,18 +1612,18 @@
+@@ -1406,18 +1410,18 @@
mocs: slaveconfig.moc
#>+ 3
@@ -44890,7 +24313,7 @@
#>+ 3
kfilterbase.moc: $(srcdir)/kfilterbase.h
-@@ -1427,6 +1633,13 @@
+@@ -1427,6 +1431,13 @@
mocs: kfilterbase.moc
#>+ 3
@@ -44904,7 +24327,7 @@
knfsshare.moc: $(srcdir)/knfsshare.h
$(MOC) $(srcdir)/knfsshare.h -o knfsshare.moc
-@@ -1441,13 +1654,6 @@
+@@ -1441,13 +1452,6 @@
mocs: kdirlister_p.moc
#>+ 3
@@ -44918,7 +24341,7 @@
kdirwatch.moc: $(srcdir)/kdirwatch.h
$(MOC) $(srcdir)/kdirwatch.h -o kdirwatch.moc
-@@ -1462,18 +1668,18 @@
+@@ -1462,18 +1466,18 @@
mocs: ksambashare.moc
#>+ 3
@@ -44943,7 +24366,7 @@
#>+ 3
passdlg.moc: $(srcdir)/passdlg.h
-@@ -1490,18 +1696,18 @@
+@@ -1490,18 +1494,18 @@
mocs: renamedlg.moc
#>+ 3
@@ -44968,7 +24391,7 @@
#>+ 3
kscan.moc: $(srcdir)/kscan.h
-@@ -1519,7 +1725,7 @@
+@@ -1519,7 +1523,7 @@
#>+ 3
clean-metasources:
@@ -44977,7 +24400,7 @@
#>+ 2
KDE_DIST=lex.l Makefile.in configure.in.in klimitediodevice.h KFILEMETAINFO_ISSUES pastedialog.h yacc.y Makefile.am kservicegroupfactory.h
-@@ -1574,7 +1780,7 @@
+@@ -1574,7 +1578,7 @@
#>+ 11
@@ -44986,7 +24409,7 @@
@echo 'creating libkiocore_la.all_cpp.cpp ...'; \
rm -f libkiocore_la.all_cpp.files libkiocore_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkiocore_la.all_cpp.final; \
-@@ -1586,7 +1792,7 @@
+@@ -1586,7 +1590,7 @@
rm -f libkiocore_la.all_cpp.final libkiocore_la.all_cpp.files
#>+ 11
@@ -44995,7 +24418,7 @@
@echo 'creating libksycoca_la.all_cpp.cpp ...'; \
rm -f libksycoca_la.all_cpp.files libksycoca_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libksycoca_la.all_cpp.final; \
-@@ -1721,8 +1927,8 @@
+@@ -1721,8 +1725,8 @@
forwardingslavebase.lo: forwardingslavebase.moc
metainfojob.o: metainfojob.moc
kurlcompletion.o: kurlcompletion.moc
@@ -45007,62 +24430,7 @@
$(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h
--- kio/kioexec/Makefile.in
+++ kio/kioexec/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kioexec_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -67,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kioexec_SOURCES)
- DIST_SOURCES = $(kioexec_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -105,6 +110,8 @@
+@@ -105,6 +105,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -45071,7 +24439,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -146,8 +153,6 @@
+@@ -146,8 +148,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -45080,7 +24448,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -224,7 +229,6 @@
+@@ -224,7 +224,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -45088,7 +24456,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -261,6 +265,9 @@
+@@ -261,6 +260,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -45098,7 +24466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +323,7 @@
+@@ -316,6 +318,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -45106,16 +24474,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -325,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -344,6 +350,7 @@
+@@ -344,6 +347,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -45123,7 +24482,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -512,7 +519,7 @@
+@@ -512,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -45132,7 +24491,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +557,9 @@
+@@ -550,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45144,114 +24503,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -598,21 +605,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -727,7 +737,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/kpasswdserver/Makefile.in
+++ kio/kpasswdserver/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
- # $Id: Makefile.am 433401 2005-07-10 18:42:04Z adridg $
- # Makefile.am of kdebase/kioslave/http
-
-+SOURCES = $(kded_kpasswdserver_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,12 +58,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -79,24 +75,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kpasswdserver.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kpasswdserver_skel.P $(DEPDIR)/kded_kpasswdserver_la.all_cpp.P ./$(DEPDIR)/kpasswdserver.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kpasswdserver_skel.P ./$(DEPDIR)/kpasswdserver.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kpasswdserver_la_SOURCES)
- DIST_SOURCES = $(kded_kpasswdserver_la_SOURCES)
- ETAGS = etags
@@ -116,6 +116,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -45296,16 +24549,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -336,8 +339,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -355,6 +356,7 @@
+@@ -355,6 +358,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -45313,7 +24557,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -527,7 +529,7 @@
+@@ -527,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -45322,7 +24566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,16 +567,16 @@
+@@ -565,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45334,197 +24578,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -582,8 +584,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -611,21 +613,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -740,7 +745,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kio/kssl/Makefile.in
-+++ kio/kssl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkssl_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -80,24 +82,91 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I. -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kopenssl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksmimecrypto.Plo ./$(DEPDIR)/kssl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertchain.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertdlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificate.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatecache.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatefactory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatehome.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslconnectioninfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcsessioncache.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslinfodlg.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslkeygen.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpeerinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpemcallback.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs12.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs7.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslsession.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslsettings.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslsigners.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslutils.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509map.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509v3.Plo
-+#>+ 44
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/keygenwizard.P $(DEPDIR)/keygenwizard2.P $(DEPDIR)/libkssl_la.all_cc.P ./$(DEPDIR)/kopenssl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmimecrypto.Plo ./$(DEPDIR)/kssl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertchain.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificate.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatecache.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatehome.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslconnectioninfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcsessioncache.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslinfodlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslkeygen.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpeerinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpemcallback.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs12.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs7.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsession.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsigners.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslutils.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509map.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509v3.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/keygenwizard.P $(DEPDIR)/keygenwizard2.P ./$(DEPDIR)/kopenssl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmimecrypto.Plo ./$(DEPDIR)/kssl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertchain.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertdlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificate.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatecache.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatefactory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatehome.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslconnectioninfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcsessioncache.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslinfodlg.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslkeygen.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpeerinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpemcallback.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs12.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs7.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsession.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsettings.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsigners.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslutils.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509map.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509v3.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkssl_la_SOURCES)
- DIST_SOURCES = $(libkssl_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -113,12 +182,6 @@
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive nmcheck-recursive bcheck-recursive
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(includedir)"
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS) $(noinst_HEADERS)
-@@ -140,6 +203,8 @@
+--- kio/kssl/kssl/caroot/Makefile.in
++++ kio/kssl/kssl/caroot/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -45533,7 +24589,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -181,8 +246,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -45542,7 +24598,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -259,7 +322,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -45550,7 +24606,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -296,6 +358,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -45560,7 +24616,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -351,6 +416,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -45568,16 +24624,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,8 +426,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -379,6 +443,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -45585,16 +24632,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -635,7 +700,7 @@
+@@ -480,7 +484,7 @@
+ all: docs-am all-am
.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*) \
-@@ -673,9 +738,9 @@
+@@ -518,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45605,171 +24652,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- ksslconfig.h: stamp-h4
-@@ -687,10 +752,6 @@
- stamp-h4: $(srcdir)/ksslconfig.h.in $(top_builddir)/config.status
- @rm -f stamp-h4
- cd $(top_builddir) && $(SHELL) ./config.status kio/kssl/ksslconfig.h
--$(srcdir)/ksslconfig.h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
-- rm -f stamp-h4
-- touch $@
-
- distclean-hdr:
- -rm -f ksslconfig.h stamp-h4
-@@ -740,21 +801,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -771,7 +835,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -779,7 +843,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -791,13 +855,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -809,7 +867,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -817,13 +875,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -844,7 +896,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -944,17 +996,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -986,7 +1036,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/kssl/kssl/Makefile.in
+++ kio/kssl/kssl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,12 +67,6 @@
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive nmcheck-recursive bcheck-recursive
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(confdir)"
- confDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(conf_DATA)
-@@ -94,6 +88,8 @@
+@@ -94,6 +94,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -45778,7 +24664,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -135,8 +131,6 @@
+@@ -135,8 +137,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -45787,7 +24673,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -213,7 +207,6 @@
+@@ -213,7 +213,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -45795,7 +24681,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -250,6 +243,9 @@
+@@ -250,6 +249,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -45805,7 +24691,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -305,6 +301,7 @@
+@@ -305,6 +307,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -45813,16 +24699,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -314,8 +311,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -333,6 +328,7 @@
+@@ -333,6 +336,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -45830,7 +24707,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -497,7 +493,7 @@
+@@ -497,7 +501,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -45839,7 +24716,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +531,9 @@
+@@ -535,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45851,131 +24728,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -554,7 +550,7 @@
- test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
- @list='$(conf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
- $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
- done
-@@ -562,7 +558,7 @@
- uninstall-confDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(conf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
- rm -f "$(DESTDIR)$(confdir)/$$f"; \
- done
-@@ -574,13 +570,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -592,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -600,13 +590,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -627,7 +611,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -726,17 +710,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -768,7 +750,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kio/kssl/kssl/caroot/Makefile.in
-+++ kio/kssl/kssl/caroot/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kssldatadir)"
- kssldataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kssldata_DATA)
-@@ -78,6 +72,8 @@
+--- kio/kssl/Makefile.in
++++ kio/kssl/Makefile.in
+@@ -140,6 +140,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -45984,7 +24739,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -181,8 +183,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -45993,7 +24748,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -259,7 +259,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -46001,7 +24756,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -296,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -46011,7 +24766,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -351,6 +353,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -46019,16 +24774,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -379,6 +382,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -46036,16 +24782,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -480,7 +476,7 @@
- all: docs-am all-am
+@@ -635,7 +639,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*) \
-@@ -518,9 +514,9 @@
+@@ -673,9 +677,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46056,125 +24802,19 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-@@ -537,7 +533,7 @@
- test -z "$(kssldatadir)" || $(mkdir_p) "$(DESTDIR)$(kssldatadir)"
- @list='$(kssldata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kssldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kssldatadir)/$$f'"; \
- $(kssldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kssldatadir)/$$f"; \
- done
-@@ -545,7 +541,7 @@
- uninstall-kssldataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kssldata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kssldatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kssldatadir)/$$f"; \
- done
-@@ -609,7 +605,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kio/misc/Makefile.in
-+++ kio/misc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,6 +37,10 @@
-
-
-
-+#>- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
-+#>+ 1
-+SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -76,16 +80,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(protocoldir)" \
-- "$(DESTDIR)$(kiomiscdir)"
-+am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(protocoldir)" "$(DESTDIR)$(kiomiscdir)"
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -119,29 +114,36 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmailservice.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kio_uiserver.la.Po $(DEPDIR)/kio_uiserver_dummy.Plo $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkdeinit_kio_uiserver_la.all_cpp.P ./$(DEPDIR)/kmailservice.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kio_uiserver.la.Po $(DEPDIR)/kio_uiserver_dummy.Plo $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/kmailservice.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
--#>- $(ktelnetservice_SOURCES)
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
-- $(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES)
-+ $(ktelnetservice_SOURCES)
- #>- DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
- #>- $(ktelnetservice_SOURCES)
- #>+ 2
-@@ -183,6 +185,8 @@
+ ksslconfig.h: stamp-h4
+@@ -687,7 +691,7 @@
+ stamp-h4: $(srcdir)/ksslconfig.h.in $(top_builddir)/config.status
+ @rm -f stamp-h4
+ cd $(top_builddir) && $(SHELL) ./config.status kio/kssl/ksslconfig.h
+-$(srcdir)/ksslconfig.h.in: $(am__configure_deps)
++$(srcdir)/ksslconfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h4
+ touch $@
+--- kio/Makefile.in
++++ kio/Makefile.in
+@@ -160,6 +160,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -46183,7 +24823,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -224,8 +228,6 @@
+@@ -201,8 +203,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -46192,7 +24832,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -302,7 +304,6 @@
+@@ -279,7 +279,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -46200,7 +24840,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -339,6 +340,9 @@
+@@ -316,6 +315,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -46210,7 +24850,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,6 +398,7 @@
+@@ -371,6 +373,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -46218,16 +24858,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +408,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -422,6 +425,7 @@
+@@ -399,6 +402,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -46235,16 +24866,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -615,7 +619,7 @@
+@@ -595,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(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*) \
-@@ -653,16 +657,16 @@
+@@ -633,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46254,282 +24885,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -670,8 +674,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -689,7 +693,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -697,8 +701,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -781,21 +785,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -812,7 +819,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -820,7 +827,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -829,7 +836,7 @@
- test -z "$(protocoldir)" || $(mkdir_p) "$(DESTDIR)$(protocoldir)"
- @list='$(protocol_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(protocolDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(protocoldir)/$$f'"; \
- $(protocolDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(protocoldir)/$$f"; \
- done
-@@ -837,7 +844,7 @@
- uninstall-protocolDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(protocol_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(protocoldir)/$$f'"; \
- rm -f "$(DESTDIR)$(protocoldir)/$$f"; \
- done
-@@ -846,7 +853,7 @@
- test -z "$(kiomiscdir)" || $(mkdir_p) "$(DESTDIR)$(kiomiscdir)"
- @list='$(kiomisc_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kiomiscHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kiomiscdir)/$$f'"; \
- $(kiomiscHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kiomiscdir)/$$f"; \
- done
-@@ -854,7 +861,7 @@
- uninstall-kiomiscHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kiomisc_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kiomiscdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kiomiscdir)/$$f"; \
- done
-@@ -866,13 +873,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -884,7 +885,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -892,13 +893,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -919,7 +914,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1018,17 +1013,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1063,7 +1056,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/kdesasl/Makefile.in
+++ kio/misc/kdesasl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkdesasl_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,14 +56,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kdesaslincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kdesaslincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -73,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kdesasl.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kdesasl.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdesasl_la_SOURCES)
- DIST_SOURCES = $(libkdesasl_la_SOURCES)
- kdesaslincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -112,6 +110,8 @@
+@@ -112,6 +112,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -46538,7 +24898,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +153,6 @@
+@@ -153,8 +155,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -46547,7 +24907,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +229,6 @@
+@@ -231,7 +231,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -46555,7 +24915,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +265,9 @@
+@@ -268,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -46565,7 +24925,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +323,7 @@
+@@ -323,6 +325,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -46573,16 +24933,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +350,7 @@
+@@ -351,6 +354,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -46590,7 +24941,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -523,7 +523,7 @@
+@@ -523,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -46599,7 +24950,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,16 +561,16 @@
+@@ -561,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46611,138 +24962,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -578,8 +578,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -610,21 +610,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -641,7 +644,7 @@
- test -z "$(kdesaslincludedir)" || $(mkdir_p) "$(DESTDIR)$(kdesaslincludedir)"
- @list='$(kdesaslinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdesaslincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdesaslincludedir)/$$f'"; \
- $(kdesaslincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdesaslincludedir)/$$f"; \
- done
-@@ -649,7 +652,7 @@
- uninstall-kdesaslincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kdesaslinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdesaslincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdesaslincludedir)/$$f"; \
- done
-@@ -755,7 +758,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/kfile/Makefile.in
+++ kio/misc/kfile/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kfile_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -67,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/fileprops.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fileprops.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_SOURCES)
- DIST_SOURCES = $(kfile_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -105,6 +110,8 @@
+@@ -105,6 +105,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -46751,7 +24973,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -146,8 +153,6 @@
+@@ -146,8 +148,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -46760,7 +24982,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -224,7 +229,6 @@
+@@ -224,7 +224,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -46768,7 +24990,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -261,6 +265,9 @@
+@@ -261,6 +260,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -46778,7 +25000,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +323,7 @@
+@@ -316,6 +318,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -46786,16 +25008,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -325,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -344,6 +350,7 @@
+@@ -344,6 +347,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -46803,7 +25016,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -512,7 +519,7 @@
+@@ -512,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -46812,7 +25025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +557,9 @@
+@@ -550,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46824,114 +25037,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -598,21 +605,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -726,7 +736,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/kntlm/Makefile.in
+++ kio/misc/kntlm/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkntlm_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kntlmincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -75,24 +71,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/des.Plo ./$(DEPDIR)/kntlm.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkntlm_la.all_cpp.P ./$(DEPDIR)/des.Plo ./$(DEPDIR)/kntlm.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/des.Plo ./$(DEPDIR)/kntlm.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkntlm_la_SOURCES)
- DIST_SOURCES = $(libkntlm_la_SOURCES)
- kntlmincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
@@ -46976,16 +25083,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +337,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +354,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -46993,7 +25091,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +527,7 @@
+@@ -525,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -47002,7 +25100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,16 +565,16 @@
+@@ -563,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47014,174 +25112,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -580,8 +582,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -613,21 +615,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -644,7 +649,7 @@
- test -z "$(kntlmincludedir)" || $(mkdir_p) "$(DESTDIR)$(kntlmincludedir)"
- @list='$(kntlminclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kntlmincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kntlmincludedir)/$$f'"; \
- $(kntlmincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kntlmincludedir)/$$f"; \
- done
-@@ -652,7 +657,7 @@
- uninstall-kntlmincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kntlminclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kntlmincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kntlmincludedir)/$$f"; \
- done
-@@ -758,7 +763,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/kpac/Makefile.in
+++ kio/misc/kpac/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(kded_proxyscout_la_SOURCES) $(kpac_dhcp_helper_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(proxyscoutdatadir)" "$(DESTDIR)$(servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(proxyscoutdatadir)" "$(DESTDIR)$(servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -90,32 +85,45 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/discovery.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/proxyscout.Plo ./$(DEPDIR)/script.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/proxyscout_skel.P $(DEPDIR)/kded_proxyscout_la.all_cpp.P ./$(DEPDIR)/discovery.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/proxyscout.Plo ./$(DEPDIR)/script.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/proxyscout_skel.P ./$(DEPDIR)/discovery.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/proxyscout.Plo ./$(DEPDIR)/script.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_proxyscout_la_SOURCES) $(kpac_dhcp_helper_SOURCES)
- DIST_SOURCES = $(kded_proxyscout_la_SOURCES) \
- $(kpac_dhcp_helper_SOURCES)
-@@ -140,6 +148,8 @@
+@@ -140,6 +140,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -47190,7 +25123,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -181,8 +191,6 @@
+@@ -181,8 +183,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -47199,7 +25132,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -259,7 +267,6 @@
+@@ -259,7 +259,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -47207,7 +25140,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -296,6 +303,9 @@
+@@ -296,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -47217,7 +25150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -351,6 +361,7 @@
+@@ -351,6 +353,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -47225,16 +25158,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,8 +371,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -379,6 +388,7 @@
+@@ -379,6 +382,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -47242,7 +25166,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -564,7 +574,7 @@
+@@ -564,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -47251,7 +25175,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,16 +612,16 @@
+@@ -602,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47263,210 +25187,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -619,8 +629,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -683,56 +693,72 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- kpac_dhcp_helper-kpac_dhcp_helper.o: kpac_dhcp_helper.c
- @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.o -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po' tmpdepfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c
-
- kpac_dhcp_helper-kpac_dhcp_helper.obj: kpac_dhcp_helper.c
- @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.obj -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po' tmpdepfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`
-
-+kpac_dhcp_helper-kpac_dhcp_helper.lo: kpac_dhcp_helper.c
-+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.lo -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.lo `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Plo"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Plo' tmpdepfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.lo `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c
-+
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -749,7 +775,7 @@
- test -z "$(proxyscoutdatadir)" || $(mkdir_p) "$(DESTDIR)$(proxyscoutdatadir)"
- @list='$(proxyscoutdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(proxyscoutdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(proxyscoutdatadir)/$$f'"; \
- $(proxyscoutdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(proxyscoutdatadir)/$$f"; \
- done
-@@ -757,7 +783,7 @@
- uninstall-proxyscoutdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(proxyscoutdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(proxyscoutdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(proxyscoutdatadir)/$$f"; \
- done
-@@ -766,7 +792,7 @@
- test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
- @list='$(services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
- $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -774,7 +800,7 @@
- uninstall-servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -880,7 +906,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/ksendbugmail/Makefile.in
+++ kio/misc/ksendbugmail/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -33,6 +33,8 @@
- # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- # Boston, MA 02110-1301, USA.
-
-+SOURCES = $(ksendbugmail_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -85,24 +87,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/smtp.Po
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/ksendbugmail.all_cpp.P ./$(DEPDIR)/main.Po ./$(DEPDIR)/smtp.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/smtp.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksendbugmail_SOURCES)
- DIST_SOURCES = $(ksendbugmail_SOURCES)
- ETAGS = etags
-@@ -122,6 +128,8 @@
+@@ -122,6 +122,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -47475,7 +25198,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -163,8 +171,6 @@
+@@ -163,8 +165,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -47484,7 +25207,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -241,7 +247,6 @@
+@@ -241,7 +241,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -47492,7 +25215,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -278,6 +283,9 @@
+@@ -278,6 +277,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -47502,7 +25225,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -333,6 +341,7 @@
+@@ -333,6 +335,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -47510,16 +25233,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -342,8 +351,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -361,6 +368,7 @@
+@@ -361,6 +364,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -47527,7 +25241,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -528,7 +536,7 @@
+@@ -528,7 +532,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -47536,7 +25250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +574,9 @@
+@@ -566,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47548,118 +25262,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -615,21 +623,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -743,7 +754,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/kssld/Makefile.in
+++ kio/misc/kssld/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
-
-
-
-+SOURCES = $(kded_kssld_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,14 +75,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -96,24 +91,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kssld.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kssld_skel.P $(DEPDIR)/kded_kssld_la.all_cpp.P ./$(DEPDIR)/kssld.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kssld_skel.P ./$(DEPDIR)/kssld.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kssld_la_SOURCES)
- DIST_SOURCES = $(kded_kssld_la_SOURCES)
- servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -136,6 +135,8 @@
+@@ -136,6 +136,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -47668,7 +25273,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -177,8 +178,6 @@
+@@ -177,8 +179,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -47677,7 +25282,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -255,7 +254,6 @@
+@@ -255,7 +255,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -47685,7 +25290,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -292,6 +290,9 @@
+@@ -292,6 +291,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -47695,7 +25300,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,6 +348,7 @@
+@@ -347,6 +349,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -47703,16 +25308,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -356,8 +358,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -375,6 +375,7 @@
+@@ -375,6 +378,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -47720,7 +25316,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -548,7 +549,7 @@
+@@ -548,7 +552,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -47729,7 +25325,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,16 +587,16 @@
+@@ -586,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47741,158 +25337,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -603,8 +604,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -632,21 +633,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -663,7 +667,7 @@
- test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
- @list='$(services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
- $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -671,7 +675,7 @@
- uninstall-servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -777,7 +781,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kio/misc/kwalletd/Makefile.in
+++ kio/misc/kwalletd/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
-
-
-
-+SOURCES = $(kded_kwalletd_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,14 +75,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -98,24 +93,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ktimeout.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletd.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kwalletd_skel.P $(DEPDIR)/kwalletwizard.P $(DEPDIR)/kbetterthankdialogbase.P $(DEPDIR)/kded_kwalletd_la.all_cpp.P ./$(DEPDIR)/ktimeout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletd.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kwalletd_skel.P $(DEPDIR)/kwalletwizard.P $(DEPDIR)/kbetterthankdialogbase.P ./$(DEPDIR)/ktimeout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletd.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kwalletd_la_SOURCES)
- DIST_SOURCES = $(kded_kwalletd_la_SOURCES)
- servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -138,6 +140,8 @@
+@@ -138,6 +138,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -47901,7 +25348,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -179,8 +183,6 @@
+@@ -179,8 +181,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -47910,7 +25357,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -257,7 +259,6 @@
+@@ -257,7 +257,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -47918,7 +25365,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -294,6 +295,9 @@
+@@ -294,6 +293,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -47928,7 +25375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +351,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -47936,15 +25383,6 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -358,8 +363,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
@@ -377,6 +380,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
@@ -47962,7 +25400,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,16 +592,16 @@
+@@ -588,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47974,95 +25412,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -605,8 +609,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -635,21 +639,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -666,7 +673,7 @@
- test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
- @list='$(services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
- $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -674,7 +681,7 @@
- uninstall-servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
- done
-@@ -780,7 +787,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kio/pics/Makefile.in
-+++ kio/pics/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,6 +68,8 @@
+--- kio/misc/Makefile.in
++++ kio/misc/Makefile.in
+@@ -183,6 +183,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -48071,7 +25423,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -109,8 +111,6 @@
+@@ -224,8 +226,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -48080,7 +25432,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -187,7 +187,6 @@
+@@ -302,7 +302,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -48088,7 +25440,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -224,6 +223,9 @@
+@@ -339,6 +338,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -48098,7 +25450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -279,6 +281,7 @@
+@@ -394,6 +396,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -48106,16 +25458,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,8 +291,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -307,6 +308,7 @@
+@@ -422,6 +425,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -48123,16 +25466,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -470,7 +472,7 @@
- all: docs-am all-am
+@@ -615,7 +619,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +510,9 @@
+@@ -653,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48142,125 +25485,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -579,7 +581,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kio/tests/Makefile.in
-+++ kio/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -33,6 +33,8 @@
- # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- # Boston, MA 02110-1301, USA.
-
-+SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) $(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) $(kionetrctest_SOURCES) $(kiopassdlgtest_SOURCES) $(kioslavetest_SOURCES) $(kmfitest_SOURCES) $(kmimefromext_SOURCES) $(kmimemagictest_SOURCES) $(kmimetypetest_SOURCES) $(kpropsdlgtest_SOURCES) $(kprotocolinfotest_SOURCES) $(kruntest_SOURCES) $(kscantest_SOURCES) $(kshredtest_SOURCES) $(ksycocatest_SOURCES) $(ksycocaupdatetest_SOURCES) $(ktartest_SOURCES) $(ktradertest_SOURCES) $(kurifiltertest_SOURCES) $(kurlcompletiontest_SOURCES) $(kziptest_SOURCES) $(metatest_SOURCES) $(netaccesstest_SOURCES) $(previewtest_SOURCES) $(speed_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,24 +286,77 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dataprotocoltest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/getalltest.Po ./$(DEPDIR)/jobtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kacltest.Po ./$(DEPDIR)/kdcopcheck.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdefaultprogresstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirlistertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatchtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiltertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kionetrctest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiopassdlgtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kioslavetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfitest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimefromext.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagictest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpropsdlgtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfotest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kruntest.Po ./$(DEPDIR)/kscantest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshredtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocatest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocaupdatetest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktartest.Po ./$(DEPDIR)/ktradertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurifiltertest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletiontest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kziptest.Po ./$(DEPDIR)/metatest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/netaccesstest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/previewtest.Po ./$(DEPDIR)/speed.Po
-+#>+ 26
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dataprotocoltest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/getalltest.Po ./$(DEPDIR)/jobtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kacltest.Po ./$(DEPDIR)/kdcopcheck.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdefaultprogresstest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirlistertest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatchtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiltertest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kionetrctest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiopassdlgtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioslavetest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfitest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimefromext.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagictest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypetest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpropsdlgtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfotest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kruntest.Po ./$(DEPDIR)/kscantest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshredtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocatest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocaupdatetest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktartest.Po ./$(DEPDIR)/ktradertest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurifiltertest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletiontest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kziptest.Po ./$(DEPDIR)/metatest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/netaccesstest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewtest.Po ./$(DEPDIR)/speed.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
- $(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
- $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) \
-@@ -351,6 +406,8 @@
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kio/pics/Makefile.in
++++ kio/pics/Makefile.in
+@@ -68,6 +68,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -48269,7 +25498,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -392,8 +449,6 @@
+@@ -109,8 +111,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -48278,7 +25507,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -470,7 +525,6 @@
+@@ -187,7 +187,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -48286,7 +25515,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -507,6 +561,9 @@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -48296,7 +25525,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,6 +619,7 @@
+@@ -279,6 +281,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -48304,16 +25533,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -571,8 +629,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -590,6 +646,7 @@
+@@ -307,6 +310,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -48321,16 +25541,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -789,7 +846,7 @@
+@@ -470,7 +474,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*) \
-@@ -827,9 +884,9 @@
+@@ -508,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48340,69 +25560,53 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -1006,21 +1063,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -1209,7 +1269,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1371,7 +1431,7 @@
- -rm -f kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchtest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
-
+--- kio/tests/Makefile.in
++++ kio/tests/Makefile.in
+@@ -85,6 +85,13 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
++am__DEPENDENCIES_1 =
++kunittest_kdirwatch_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
++am_kunittest_kdirwatch_la_OBJECTS = kdirwatchunittest.lo
++#>- kunittest_kdirwatch_la_OBJECTS = $(am_kunittest_kdirwatch_la_OBJECTS)
++#>+ 1
++kunittest_kdirwatch_la_OBJECTS = kdirwatchunittest.lo
+ am__installdirs = "$(DESTDIR)$(bindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+@@ -93,7 +100,6 @@
+ #>+ 1
+ dataprotocoltest_OBJECTS = dataprotocoltest.$(OBJEXT)
+ dataprotocoltest_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+ dataprotocoltest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_getalltest_OBJECTS = getalltest.$(OBJEXT)
+ #>- getalltest_OBJECTS = $(am_getalltest_OBJECTS)
+@@ -302,7 +308,8 @@
#>+ 2
--KDE_DIST=kdirwatchtest.h dummymeta.desktop kacltest.h Makefile.in wronglocalsizes.zip speed.h kdcopcheck.h jobtest.h kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am
-+KDE_DIST=kdirwatchtest.h kacltest.h dummymeta.desktop Makefile.in wronglocalsizes.zip speed.h kdcopcheck.h jobtest.h kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am
-
- #>+ 2
- docs-am:
---- kioslave/Makefile.in
-+++ kioslave/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -103,6 +103,8 @@
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
++SOURCES = $(kunittest_kdirwatch_la_SOURCES) \
++ $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
+ $(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
+ $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) \
+ $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) \
+@@ -318,7 +325,8 @@
+ $(kziptest_SOURCES) $(metatest_SOURCES) \
+ $(netaccesstest_SOURCES) $(previewtest_SOURCES) \
+ $(speed_SOURCES)
+-DIST_SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
++DIST_SOURCES = $(kunittest_kdirwatch_la_SOURCES) \
++ $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
+ $(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
+ $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) \
+ $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) \
+@@ -351,6 +359,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -48411,7 +25615,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -144,8 +146,6 @@
+@@ -392,8 +402,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -48420,7 +25624,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -222,7 +222,6 @@
+@@ -470,7 +478,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -48428,7 +25632,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -259,6 +258,9 @@
+@@ -507,6 +514,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -48438,7 +25642,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -314,6 +316,7 @@
+@@ -562,6 +572,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -48446,16 +25650,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -323,8 +326,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -342,6 +343,7 @@
+@@ -590,6 +601,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -48463,16 +25658,26 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -505,7 +507,7 @@
- all: docs-am all-recursive
+@@ -783,13 +795,17 @@
+ kurlcompletiontest_SOURCES = kurlcompletiontest.cpp
+ kmimetypetest_SOURCES = kmimetypetest.cpp
+ kacltest_SOURCES = kacltest.cpp
++check_LTLIBRARIES = kunittest_kdirwatch.la
++kunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
++kunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
++kunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
.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)
+ .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*) \
-@@ -543,9 +545,9 @@
+@@ -827,10 +843,21 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48482,157 +25687,136 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -565,13 +567,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -583,7 +579,7 @@
- local_target="$$target"; \
++
++clean-checkLTLIBRARIES:
++ -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
++ @list='$(check_LTLIBRARIES)'; for p in $$list; do \
++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++ test "$$dir" != "$$p" || dir=.; \
++ echo "rm -f \"$${dir}/so_locations\""; \
++ rm -f "$${dir}/so_locations"; \
++ done
++kunittest_kdirwatch.la: $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_DEPENDENCIES)
++ $(CXXLINK) $(kunittest_kdirwatch_la_LDFLAGS) $(kunittest_kdirwatch_la_OBJECTS) $(kunittest_kdirwatch_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+@@ -977,6 +1004,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdefaultprogresstest.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdirlistertest.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdirwatchtest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kdirwatchunittest.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kfiltertest.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kionetrctest.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kiopassdlgtest.Po at am__quote@
+@@ -1182,7 +1210,7 @@
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -591,13 +587,7 @@
+ done
+ check-am: all-am
+- $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
++ $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS)
+@@ -1218,11 +1246,11 @@
+ #>+ 1
+ clean: kde-rpo-clean clean-am
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -618,7 +608,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -721,14 +711,12 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -757,7 +745,7 @@
- clean-generic:
+-#>- clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+-#>- clean-libtool mostlyclean-am
++#>- clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
++#>- clean-generic clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-bcheck clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+- clean-libtool mostlyclean-am
++clean-am: clean-metasources clean-bcheck clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
++ clean-generic clean-libtool mostlyclean-am
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+@@ -1271,17 +1299,18 @@
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kioslave/bzip2/Makefile.in
-+++ kioslave/bzip2/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
+- clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+- clean-libtool ctags distclean distclean-compile \
+- distclean-generic distclean-libtool distclean-tags distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-binPROGRAMS install-data install-data-am install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-info-am
++ clean clean-binPROGRAMS clean-checkLTLIBRARIES \
++ clean-checkPROGRAMS clean-generic clean-libtool ctags \
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-binPROGRAMS \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-binPROGRAMS \
++ uninstall-info-am
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
+ # Unfortunately some tests depend on the network settings, it seems
+@@ -1339,6 +1368,13 @@
+ mocs: kdirwatchtest.moc
-+SOURCES = $(kbzip2filter_la_SOURCES)
+ #>+ 3
++kdirwatchunittest.moc: $(srcdir)/kdirwatchunittest.h
++ $(MOC) $(srcdir)/kdirwatchunittest.h -o kdirwatchunittest.moc
+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -73,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++mocs: kdirwatchunittest.moc
++
++#>+ 3
+ kioslavetest.moc: $(srcdir)/kioslavetest.h
+ $(MOC) $(srcdir)/kioslavetest.h -o kioslavetest.moc
+
+@@ -1368,10 +1404,10 @@
+
#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ clean-metasources:
+- -rm -f kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchtest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
++ -rm -f kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchtest.moc kdirwatchunittest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
+
#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kbzip2filter_la_SOURCES)
- DIST_SOURCES = $(kbzip2filter_la_SOURCES)
- kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -112,6 +110,8 @@
+-KDE_DIST=kdirwatchtest.h dummymeta.desktop kacltest.h Makefile.in wronglocalsizes.zip speed.h kdcopcheck.h jobtest.h kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am
++KDE_DIST=kdirwatchtest.h kacltest.h dummymeta.desktop Makefile.in wronglocalsizes.zip speed.h kdcopcheck.h jobtest.h kdirwatchunittest.h kruntest.h kioslavetest.h previewtest.h dummymeta.h kdirlistertest.h Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -1434,7 +1470,8 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 21
++#>+ 23
++kdirwatchunittest.o: kdirwatchunittest.moc
+ dummymeta.o: dummymeta.moc
+ kruntest.lo: kruntest.moc
+ kioslavetest.lo: kioslavetest.moc
+@@ -1448,10 +1485,11 @@
+ nmcheck-am: nmcheck
+ kdcopcheck.lo: kdcopcheck.moc
+ dummymeta.lo: dummymeta.moc
+-previewtest.lo: previewtest.moc
+ speed.o: speed.moc
++previewtest.lo: previewtest.moc
+ kdirlistertest.lo: kdirlistertest.moc
+ previewtest.o: previewtest.moc
++kdirwatchunittest.lo: kdirwatchunittest.moc
+ jobtest.lo: jobtest.moc
+ kdcopcheck.o: kdcopcheck.moc
+ speed.lo: speed.moc
+--- kioslave/bzip2/Makefile.in
++++ kioslave/bzip2/Makefile.in
+@@ -112,6 +112,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -48641,7 +25825,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +153,6 @@
+@@ -153,8 +155,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -48650,7 +25834,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +229,6 @@
+@@ -231,7 +231,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -48658,7 +25842,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +265,9 @@
+@@ -268,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -48668,7 +25852,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +323,7 @@
+@@ -323,6 +325,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -48676,16 +25860,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +350,7 @@
+@@ -351,6 +354,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -48693,7 +25868,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -520,7 +520,7 @@
+@@ -520,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -48702,7 +25877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,16 +558,16 @@
+@@ -558,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48714,154 +25889,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -575,8 +575,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -607,21 +607,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -638,7 +641,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -646,7 +649,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -752,7 +755,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kioslave/file/Makefile.in
+++ kioslave/file/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kio_file_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(fileincludedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(fileincludedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -74,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/file.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/file.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_file_la_SOURCES)
- DIST_SOURCES = $(kio_file_la_SOURCES)
- kdelnkDATA_INSTALL = $(INSTALL_DATA)
-@@ -115,6 +113,8 @@
+@@ -115,6 +115,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -48870,7 +25900,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -156,8 +156,6 @@
+@@ -156,8 +158,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -48879,7 +25909,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -234,7 +232,6 @@
+@@ -234,7 +234,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -48887,7 +25917,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -271,6 +268,9 @@
+@@ -271,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -48897,7 +25927,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +326,7 @@
+@@ -326,6 +328,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -48905,16 +25935,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -335,8 +336,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -354,6 +353,7 @@
+@@ -354,6 +357,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -48922,7 +25943,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -530,7 +530,7 @@
+@@ -530,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -48931,7 +25952,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,16 +568,16 @@
+@@ -568,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48943,172 +25964,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -585,8 +585,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -617,21 +617,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -648,7 +651,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -656,7 +659,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -665,7 +668,7 @@
- test -z "$(fileincludedir)" || $(mkdir_p) "$(DESTDIR)$(fileincludedir)"
- @list='$(fileinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(fileincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(fileincludedir)/$$f'"; \
- $(fileincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(fileincludedir)/$$f"; \
- done
-@@ -673,7 +676,7 @@
- uninstall-fileincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(fileinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(fileincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(fileincludedir)/$$f"; \
- done
-@@ -779,7 +782,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kioslave/ftp/Makefile.in
+++ kioslave/ftp/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kio_ftp_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdelnkdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -74,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ftp.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ftp.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_ftp_la_SOURCES)
- DIST_SOURCES = $(kio_ftp_la_SOURCES)
- kdelnkDATA_INSTALL = $(INSTALL_DATA)
-@@ -114,6 +112,8 @@
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -49117,7 +25975,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +155,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -49126,7 +25984,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +231,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -49134,7 +25992,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +267,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -49144,7 +26002,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +325,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -49152,16 +26010,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +335,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +352,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -49169,7 +26018,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +525,7 @@
+@@ -525,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -49178,7 +26027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,16 +563,16 @@
+@@ -563,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49190,154 +26039,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -580,8 +580,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -612,21 +612,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -643,7 +646,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -651,7 +654,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -757,7 +760,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kioslave/gzip/Makefile.in
+++ kioslave/gzip/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kgzipfilter_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kde_servicesdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -73,24 +68,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kgzipfilter.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kgzipfilter.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kgzipfilter_la_SOURCES)
- DIST_SOURCES = $(kgzipfilter_la_SOURCES)
- kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-@@ -112,6 +110,8 @@
+@@ -112,6 +112,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -49346,7 +26050,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -153,8 +153,6 @@
+@@ -153,8 +155,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -49355,7 +26059,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -231,7 +229,6 @@
+@@ -231,7 +231,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -49363,7 +26067,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -268,6 +265,9 @@
+@@ -268,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -49373,7 +26077,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -323,6 +323,7 @@
+@@ -323,6 +325,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -49381,16 +26085,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -332,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -351,6 +350,7 @@
+@@ -351,6 +354,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -49398,7 +26093,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -521,7 +521,7 @@
+@@ -521,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -49407,7 +26102,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,16 +559,16 @@
+@@ -559,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49419,163 +26114,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -576,8 +576,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -608,21 +608,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -639,7 +642,7 @@
- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -647,7 +650,7 @@
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-@@ -753,7 +756,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kioslave/http/Makefile.in
-+++ kioslave/http/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -21,6 +21,10 @@
-
-
-
-+#>- SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -60,15 +64,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
-@@ -100,27 +96,30 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/http.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo
-+#>+ 2
-+ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_http_cache_cleaner.la.Po $(DEPDIR)/kio_http_cache_cleaner_dummy.Plo ./$(DEPDIR)/http.Plo \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
--#>+ 1
--SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES)
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
- #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
- #>- $(kio_http_cache_cleaner_la_SOURCES)
- #>+ 2
-@@ -160,6 +159,8 @@
+--- kioslave/http/kcookiejar/Makefile.in
++++ kioslave/http/kcookiejar/Makefile.in
+@@ -160,6 +160,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -49584,7 +26125,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -201,8 +202,6 @@
+@@ -201,8 +203,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -49593,7 +26134,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -279,7 +278,6 @@
+@@ -279,7 +279,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -49601,7 +26142,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -316,6 +314,9 @@
+@@ -316,6 +315,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -49611,7 +26152,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -371,6 +372,7 @@
+@@ -371,6 +373,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -49619,16 +26160,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,8 +382,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -399,6 +399,7 @@
+@@ -399,6 +402,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -49636,16 +26168,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -583,7 +584,7 @@
+@@ -588,7 +592,7 @@
.SUFFIXES:
- .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)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,16 +622,16 @@
+@@ -626,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49657,306 +26189,59 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -638,8 +639,8 @@
+@@ -1167,18 +1171,18 @@
+ kcookiejar_DEPENDENCIES = libkdeinit_kcookiejar.la
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -657,7 +658,7 @@
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -665,8 +666,8 @@
+ #>+ 3
+-kcookiewin.moc: $(srcdir)/kcookiewin.h
+- $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc
++kcookieserver.moc: $(srcdir)/kcookieserver.h
++ $(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -684,7 +685,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -692,8 +693,8 @@
+ #>+ 2
+-mocs: kcookiewin.moc
++mocs: kcookieserver.moc
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -755,42 +756,48 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ #>+ 3
+-kcookieserver.moc: $(srcdir)/kcookieserver.h
+- $(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc
++kcookiewin.moc: $(srcdir)/kcookiewin.h
++ $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ #>+ 2
+-mocs: kcookieserver.moc
++mocs: kcookiewin.moc
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ #>+ 5
+ kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES)
+@@ -1188,7 +1192,7 @@
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ #>+ 3
+ clean-metasources:
+- -rm -f kcookiewin.moc kcookieserver.moc
++ -rm -f kcookieserver.moc kcookiewin.moc
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ #>+ 2
+ KDE_DIST=kcookiescfg.upd Makefile.in kcookiejar.h kcookiejar.desktop rfc2965 kcookieserver.h domain_info netscape_cookie_spec.html kcookiewin.h rfc2109 Makefile.am
+@@ -1240,7 +1244,7 @@
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
- mostlyclean-libtool:
-@@ -807,7 +814,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -815,7 +822,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -827,13 +834,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -845,7 +846,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -853,13 +854,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -880,7 +875,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -980,17 +975,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1024,7 +1017,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kioslave/http/kcookiejar/Makefile.in
-+++ kioslave/http/kcookiejar/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,6 +19,10 @@
-
-
-
-+#>- SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,16 +61,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cookiedir)" \
-- "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(updatedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cookiedir)" "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(updatedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
-@@ -101,27 +96,35 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcookiejar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kcookiejar.la.Po $(DEPDIR)/kcookiejar_dummy.Plo $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/kded_kcookiejar_la.all_cpp.P ./$(DEPDIR)/kcookiejar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kcookiejar.la.Po $(DEPDIR)/kcookiejar_dummy.Plo $(DEPDIR)/kcookieserver_skel.P ./$(DEPDIR)/kcookiejar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
--#>+ 1
--SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
- #>- DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
-@@ -160,6 +163,8 @@
+ #>+ 11
+-kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp kcookieserver.moc kcookiewin.moc
++kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp kcookiewin.moc kcookieserver.moc
+ @echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \
+ rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \
+@@ -1293,5 +1297,5 @@
+ nmcheck-am: nmcheck
+ kcookiewin.lo: kcookiewin.moc
+ kcookieserver.lo: kcookieserver.moc
+-kcookiewin.o: kcookiewin.moc
+ kcookieserver.o: kcookieserver.moc
++kcookiewin.o: kcookiewin.moc
+--- kioslave/http/kcookiejar/tests/Makefile.in
++++ kioslave/http/kcookiejar/tests/Makefile.in
+@@ -101,6 +101,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -49965,7 +26250,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -201,8 +206,6 @@
+@@ -142,8 +144,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -49974,7 +26259,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -279,7 +282,6 @@
+@@ -220,7 +220,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -49982,7 +26267,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -316,6 +318,9 @@
+@@ -257,6 +256,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -49992,7 +26277,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -371,6 +376,7 @@
+@@ -312,6 +314,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -50000,16 +26285,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,8 +386,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -399,6 +403,7 @@
+@@ -340,6 +343,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -50017,7 +26293,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -588,7 +593,7 @@
+@@ -506,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -50026,7 +26302,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,16 +631,16 @@
+@@ -544,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50036,336 +26312,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -643,8 +648,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -662,7 +667,7 @@
- test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
- @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
- else :; fi; \
-@@ -670,8 +675,8 @@
-
- uninstall-kdeinitLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
- done
-@@ -689,7 +694,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -697,8 +702,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -759,21 +764,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -790,7 +798,7 @@
- test -z "$(cookiedir)" || $(mkdir_p) "$(DESTDIR)$(cookiedir)"
- @list='$(cookie_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(cookieDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cookiedir)/$$f'"; \
- $(cookieDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cookiedir)/$$f"; \
- done
-@@ -798,7 +806,7 @@
- uninstall-cookieDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(cookie_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(cookiedir)/$$f'"; \
- rm -f "$(DESTDIR)$(cookiedir)/$$f"; \
- done
-@@ -807,7 +815,7 @@
- test -z "$(kdeddir)" || $(mkdir_p) "$(DESTDIR)$(kdeddir)"
- @list='$(kded_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeddir)/$$f'"; \
- $(kdedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeddir)/$$f"; \
- done
-@@ -815,7 +823,7 @@
- uninstall-kdedDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kded_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdeddir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdeddir)/$$f"; \
- done
-@@ -824,7 +832,7 @@
- test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
- @list='$(update_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
- $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -832,7 +840,7 @@
- uninstall-updateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(update_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
- rm -f "$(DESTDIR)$(updatedir)/$$f"; \
- done
-@@ -844,13 +852,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -862,7 +864,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -870,13 +872,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -897,7 +893,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -996,17 +992,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -1040,7 +1034,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1167,18 +1161,18 @@
- kcookiejar_DEPENDENCIES = libkdeinit_kcookiejar.la
-
- #>+ 3
--kcookiewin.moc: $(srcdir)/kcookiewin.h
-- $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc
-+kcookieserver.moc: $(srcdir)/kcookieserver.h
-+ $(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc
-
- #>+ 2
--mocs: kcookiewin.moc
-+mocs: kcookieserver.moc
-
- #>+ 3
--kcookieserver.moc: $(srcdir)/kcookieserver.h
-- $(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc
-+kcookiewin.moc: $(srcdir)/kcookiewin.h
-+ $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc
-
- #>+ 2
--mocs: kcookieserver.moc
-+mocs: kcookiewin.moc
-
- #>+ 5
- kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES)
-@@ -1188,7 +1182,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kcookiewin.moc kcookieserver.moc
-+ -rm -f kcookieserver.moc kcookiewin.moc
-
- #>+ 2
- KDE_DIST=kcookiescfg.upd Makefile.in kcookiejar.h kcookiejar.desktop rfc2965 kcookieserver.h domain_info netscape_cookie_spec.html kcookiewin.h rfc2109 Makefile.am
-@@ -1240,7 +1234,7 @@
-
-
- #>+ 11
--kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp kcookieserver.moc kcookiewin.moc
-+kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp kcookiewin.moc kcookieserver.moc
- @echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \
- rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \
-@@ -1293,5 +1287,5 @@
- nmcheck-am: nmcheck
- kcookiewin.lo: kcookiewin.moc
- kcookieserver.lo: kcookieserver.moc
--kcookiewin.o: kcookiewin.moc
- kcookieserver.o: kcookieserver.moc
-+kcookiewin.o: kcookiewin.moc
---- kioslave/http/kcookiejar/tests/Makefile.in
-+++ kioslave/http/kcookiejar/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
- # $Id: Makefile.am 362284 2004-11-11 18:14:09Z waba $
- # Makefile.am of kdebase/kioslave/http
-+SOURCES = $(kcookiejartest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -64,24 +66,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcookiejartest.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kcookiejartest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcookiejartest_SOURCES)
- DIST_SOURCES = $(kcookiejartest_SOURCES)
- ETAGS = etags
-@@ -101,6 +106,8 @@
+ clean-checkPROGRAMS:
+--- kioslave/http/Makefile.in
++++ kioslave/http/Makefile.in
+@@ -160,6 +160,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -50374,7 +26325,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -142,8 +149,6 @@
+@@ -201,8 +203,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -50383,7 +26334,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -220,7 +225,6 @@
+@@ -279,7 +279,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -50391,7 +26342,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -257,6 +261,9 @@
+@@ -316,6 +315,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -50401,7 +26352,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -312,6 +319,7 @@
+@@ -371,6 +373,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -50409,16 +26360,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -321,8 +329,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -340,6 +346,7 @@
+@@ -399,6 +402,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -50426,16 +26368,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -506,7 +513,7 @@
+@@ -583,7 +587,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .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*) \
-@@ -544,9 +551,9 @@
+@@ -621,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50445,119 +26387,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-checkPROGRAMS:
-@@ -571,21 +578,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -698,7 +708,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kioslave/metainfo/Makefile.in
-+++ kioslave/metainfo/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kio_metainfo_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(kdelnkdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -74,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/metainfo.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/metainfo.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_metainfo_la_SOURCES)
- DIST_SOURCES = $(kio_metainfo_la_SOURCES)
- kdelnkDATA_INSTALL = $(INSTALL_DATA)
-@@ -114,6 +112,8 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kioslave/Makefile.in
++++ kioslave/Makefile.in
+@@ -103,6 +103,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -50566,7 +26400,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +155,6 @@
+@@ -144,8 +146,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -50575,7 +26409,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +231,6 @@
+@@ -222,7 +222,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -50583,7 +26417,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +267,9 @@
+@@ -259,6 +258,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -50593,7 +26427,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +325,7 @@
+@@ -314,6 +316,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -50601,16 +26435,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +335,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +352,7 @@
+@@ -342,6 +345,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -50618,16 +26443,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +525,7 @@
+@@ -505,7 +509,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)
+-$(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*) \
-@@ -563,16 +563,16 @@
+@@ -543,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50637,232 +26462,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -580,8 +580,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -612,21 +612,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -643,7 +646,7 @@
- test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
- @list='$(kdelnk_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -651,7 +654,7 @@
- uninstall-kdelnkDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kdelnk_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
- done
-@@ -757,7 +760,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kjs/Makefile.in
-+++ kjs/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -34,6 +34,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) $(testkjs_static_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -74,12 +76,6 @@
- $(top_builddir)/kdecore/kdemacros.h \
- $(top_builddir)/kio/kssl/ksslconfig.h global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kjsincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -119,24 +115,106 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I.
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/array_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/bool_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/collector.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/date_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/debugger.Plo ./$(DEPDIR)/dtoa.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/error_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/function.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/function_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/grammar.Plo ./$(DEPDIR)/identifier.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/internal.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/interpreter.Plo ./$(DEPDIR)/lexer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/list.Plo ./$(DEPDIR)/lookup.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/math_object.Plo ./$(DEPDIR)/nodes.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/nodes2string.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/number_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/object_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/operations.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/property_map.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/reference.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/reference_list.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/regexp.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/regexp_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/scope_chain.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/string_object.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testkjs.Po ./$(DEPDIR)/ustring.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/value.Plo
-+#>+ 54
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkjs_la.all_cpp.P ./$(DEPDIR)/array_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/bool_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/collector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/date_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/debugger.Plo ./$(DEPDIR)/dtoa.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/error_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/function.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/function_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/grammar.Plo ./$(DEPDIR)/identifier.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/internal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/interpreter.Plo ./$(DEPDIR)/lexer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/list.Plo ./$(DEPDIR)/lookup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/math_object.Plo ./$(DEPDIR)/nodes.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/nodes2string.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/number_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/object_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/operations.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/property_map.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference_list.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/scope_chain.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/string_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkjs.Po ./$(DEPDIR)/ustring.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/value.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/array_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/bool_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/collector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/date_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/debugger.Plo ./$(DEPDIR)/dtoa.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/error_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/function.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/function_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/grammar.Plo ./$(DEPDIR)/identifier.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/internal.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/interpreter.Plo ./$(DEPDIR)/lexer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/list.Plo ./$(DEPDIR)/lookup.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/math_object.Plo ./$(DEPDIR)/nodes.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/nodes2string.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/number_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/object_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/operations.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/property_map.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference_list.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/scope_chain.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/string_object.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkjs.Po ./$(DEPDIR)/ustring.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/value.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) \
- $(testkjs_static_SOURCES)
- DIST_SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) \
-@@ -160,6 +238,8 @@
+--- kioslave/metainfo/Makefile.in
++++ kioslave/metainfo/Makefile.in
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -50871,7 +26475,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -201,8 +281,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -50880,7 +26484,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -279,7 +357,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -50888,7 +26492,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -316,6 +393,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -50898,7 +26502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -371,6 +451,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -50906,16 +26510,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,8 +461,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -399,6 +478,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -50923,16 +26518,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -606,7 +686,7 @@
+@@ -525,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +724,9 @@
+@@ -563,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50942,196 +26537,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- global.h: stamp-h5
-@@ -658,10 +738,6 @@
- stamp-h5: $(srcdir)/global.h.in $(top_builddir)/config.status
- @rm -f stamp-h5
- cd $(top_builddir) && $(SHELL) ./config.status kjs/global.h
--$(srcdir)/global.h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
-- rm -f stamp-h5
-- touch $@
-
- distclean-hdr:
- -rm -f global.h stamp-h5
-@@ -670,7 +746,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -678,8 +754,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -755,21 +831,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -786,7 +865,7 @@
- test -z "$(kjsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kjsincludedir)"
- @list='$(kjsinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kjsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kjsincludedir)/$$f'"; \
- $(kjsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kjsincludedir)/$$f"; \
- done
-@@ -794,7 +873,7 @@
- uninstall-kjsincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kjsinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kjsincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kjsincludedir)/$$f"; \
- done
-@@ -903,7 +982,7 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kmdi/Makefile.in
-+++ kmdi/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkmdi_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -82,24 +78,58 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmdichildarea.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrm.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrmcaption.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildview.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdidockcontainer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdidocumentviewtabwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdifocuslist.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdiguiclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdimainfrm.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmditaskbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmditoolviewaccessor.Plo
-+#>+ 22
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkmdi_la.all_cpp.P ./$(DEPDIR)/kmdichildarea.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrmcaption.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidockcontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidocumentviewtabwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdifocuslist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdiguiclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdimainfrm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditaskbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditoolviewaccessor.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kmdichildarea.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrmcaption.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildview.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidockcontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidocumentviewtabwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdifocuslist.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdiguiclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdimainfrm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditaskbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditoolviewaccessor.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmdi_la_SOURCES)
- DIST_SOURCES = $(libkmdi_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -135,6 +165,8 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kjs/Makefile.in
++++ kjs/Makefile.in
+@@ -160,6 +160,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -51140,7 +26550,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -176,8 +208,6 @@
+@@ -201,8 +203,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -51149,7 +26559,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -254,7 +284,6 @@
+@@ -279,7 +279,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -51157,7 +26567,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -291,6 +320,9 @@
+@@ -316,6 +315,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -51167,7 +26577,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -346,6 +378,7 @@
+@@ -371,6 +373,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -51175,16 +26585,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -355,8 +388,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -374,6 +405,7 @@
+@@ -399,6 +402,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -51192,7 +26593,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -551,7 +583,7 @@
+@@ -606,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -51201,7 +26602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,16 +621,16 @@
+@@ -644,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51211,279 +26612,20 @@
-$(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)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -606,8 +638,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -645,21 +677,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -676,7 +711,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -684,7 +719,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -696,13 +731,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -714,7 +743,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -722,13 +751,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -749,7 +772,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -849,17 +872,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -891,7 +912,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1090,18 +1111,18 @@
- mocs: kmdichildfrm.moc
-
- #>+ 3
--kmdidocumentviewtabwidget.moc: $(srcdir)/kmdidocumentviewtabwidget.h
-- $(MOC) $(srcdir)/kmdidocumentviewtabwidget.h -o kmdidocumentviewtabwidget.moc
-+kmdichildarea.moc: $(srcdir)/kmdichildarea.h
-+ $(MOC) $(srcdir)/kmdichildarea.h -o kmdichildarea.moc
-
- #>+ 2
--mocs: kmdidocumentviewtabwidget.moc
-+mocs: kmdichildarea.moc
-
- #>+ 3
--kmdichildarea.moc: $(srcdir)/kmdichildarea.h
-- $(MOC) $(srcdir)/kmdichildarea.h -o kmdichildarea.moc
-+kmdidocumentviewtabwidget.moc: $(srcdir)/kmdidocumentviewtabwidget.h
-+ $(MOC) $(srcdir)/kmdidocumentviewtabwidget.h -o kmdidocumentviewtabwidget.moc
-
- #>+ 2
--mocs: kmdichildarea.moc
-+mocs: kmdidocumentviewtabwidget.moc
-
- #>+ 3
- kmdifocuslist.moc: $(srcdir)/kmdifocuslist.h
-@@ -1147,7 +1168,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdidocumentviewtabwidget.moc kmdichildarea.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmdichildfrmcaption.moc kmditoolviewaccessor.moc
-+ -rm -f kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdichildarea.moc kmdidocumentviewtabwidget.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmdichildfrmcaption.moc kmditoolviewaccessor.moc
-
- #>+ 2
- KDE_DIST=kmdiguiclient.h Makefile.in kmdidockcontainer.h kmdidocumentviewtabwidget.h kmdifocuslist.h Makefile.am kmditoolviewaccessor_p.h
-@@ -1194,7 +1215,7 @@
-
-
- #>+ 11
--libkmdi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdichildarea.cpp $(srcdir)/kmdichildfrm.cpp $(srcdir)/kmdichildfrmcaption.cpp $(srcdir)/kmdichildview.cpp $(srcdir)/kmdimainfrm.cpp $(srcdir)/kmditaskbar.cpp $(srcdir)/kmdidockcontainer.cpp $(srcdir)/kmditoolviewaccessor.cpp $(srcdir)/kmdiguiclient.cpp $(srcdir)/kmdidocumentviewtabwidget.cpp $(srcdir)/kmdifocuslist.cpp kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdidocumentviewtabwidget.moc kmdichildarea.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmditoolviewaccessor.moc kmdichildfrmcaption.moc
-+libkmdi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdichildarea.cpp $(srcdir)/kmdichildfrm.cpp $(srcdir)/kmdichildfrmcaption.cpp $(srcdir)/kmdichildview.cpp $(srcdir)/kmdimainfrm.cpp $(srcdir)/kmditaskbar.cpp $(srcdir)/kmdidockcontainer.cpp $(srcdir)/kmditoolviewaccessor.cpp $(srcdir)/kmdiguiclient.cpp $(srcdir)/kmdidocumentviewtabwidget.cpp $(srcdir)/kmdifocuslist.cpp kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdichildarea.moc kmdidocumentviewtabwidget.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmditoolviewaccessor.moc kmdichildfrmcaption.moc
- @echo 'creating libkmdi_la.all_cpp.cpp ...'; \
- rm -f libkmdi_la.all_cpp.files libkmdi_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
+ global.h: stamp-h5
+@@ -658,7 +662,7 @@
+ stamp-h5: $(srcdir)/global.h.in $(top_builddir)/config.status
+ @rm -f stamp-h5
+ cd $(top_builddir) && $(SHELL) ./config.status kjs/global.h
+-$(srcdir)/global.h.in: $(am__configure_deps)
++$(srcdir)/global.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h5
+ touch $@
--- kmdi/kmdi/Makefile.in
+++ kmdi/kmdi/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkmdi2_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kmdiincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -78,24 +74,40 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dockcontainer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/guiclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/tabwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/toolviewaccessor.Plo
-+#>+ 10
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkmdi2_la.all_cpp.P ./$(DEPDIR)/dockcontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/guiclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tabwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/toolviewaccessor.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dockcontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/guiclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tabwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/toolviewaccessor.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmdi2_la_SOURCES)
- DIST_SOURCES = $(libkmdi2_la_SOURCES)
- kmdiincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -117,6 +129,8 @@
+@@ -117,6 +117,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -51492,7 +26634,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -158,8 +172,6 @@
+@@ -158,8 +160,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -51501,7 +26643,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -236,7 +248,6 @@
+@@ -236,7 +236,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -51509,7 +26651,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -273,6 +284,9 @@
+@@ -273,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -51519,7 +26661,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,6 +342,7 @@
+@@ -328,6 +330,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -51527,16 +26669,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -337,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -356,6 +369,7 @@
+@@ -356,6 +359,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -51544,7 +26677,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -526,7 +540,7 @@
+@@ -526,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -51553,7 +26686,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,16 +578,16 @@
+@@ -564,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51565,81 +26698,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -581,8 +595,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -614,21 +628,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -645,7 +662,7 @@
- test -z "$(kmdiincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmdiincludedir)"
- @list='$(kmdiinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kmdiincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kmdiincludedir)/$$f'"; \
- $(kmdiincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kmdiincludedir)/$$f"; \
- done
-@@ -653,7 +670,7 @@
- uninstall-kmdiincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kmdiinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kmdiincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kmdiincludedir)/$$f"; \
- done
-@@ -760,7 +777,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -941,18 +958,18 @@
+@@ -941,18 +945,18 @@
mocs: toolviewaccessor.moc
#>+ 3
@@ -51664,7 +26723,7 @@
#>+ 3
guiclient.moc: $(srcdir)/guiclient.h
-@@ -970,7 +987,7 @@
+@@ -970,7 +974,7 @@
#>+ 3
clean-metasources:
@@ -51673,7 +26732,7 @@
#>+ 2
KDE_DIST=Makefile.in dockcontainer.h toolviewaccessor_p.h guiclient.h Makefile.am
-@@ -1017,7 +1034,7 @@
+@@ -1017,7 +1021,7 @@
#>+ 11
@@ -51682,7 +26741,7 @@
@echo 'creating libkmdi2_la.all_cpp.cpp ...'; \
rm -f libkmdi2_la.all_cpp.files libkmdi2_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmdi2_la.all_cpp.final; \
-@@ -1054,14 +1071,14 @@
+@@ -1054,14 +1058,14 @@
#>+ 13
nmcheck:
@@ -51699,68 +26758,127 @@
+mainwindow.o: mainwindow.moc
toolviewaccessor.lo: toolviewaccessor.moc
dockcontainer.o: dockcontainer.moc
---- kmdi/test/Makefile.in
-+++ kmdi/test/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+--- kmdi/Makefile.in
++++ kmdi/Makefile.in
+@@ -135,6 +135,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -176,8 +178,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -254,7 +254,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -291,6 +290,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -346,6 +348,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,6 +377,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -551,7 +555,7 @@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -589,9 +593,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- @SET_MAKE@
-+SOURCES = $(kfourchildren_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -65,24 +67,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/hello.Po ./$(DEPDIR)/main.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/mainwidget.Po
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kfourchildren.all_cpp.P ./$(DEPDIR)/hello.Po ./$(DEPDIR)/main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwidget.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/hello.Po ./$(DEPDIR)/main.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwidget.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
+@@ -1090,18 +1094,18 @@
+ mocs: kmdichildfrm.moc
+
+ #>+ 3
+-kmdidocumentviewtabwidget.moc: $(srcdir)/kmdidocumentviewtabwidget.h
+- $(MOC) $(srcdir)/kmdidocumentviewtabwidget.h -o kmdidocumentviewtabwidget.moc
++kmdichildarea.moc: $(srcdir)/kmdichildarea.h
++ $(MOC) $(srcdir)/kmdichildarea.h -o kmdichildarea.moc
+
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+-mocs: kmdidocumentviewtabwidget.moc
++mocs: kmdichildarea.moc
+
#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-kmdichildarea.moc: $(srcdir)/kmdichildarea.h
+- $(MOC) $(srcdir)/kmdichildarea.h -o kmdichildarea.moc
++kmdidocumentviewtabwidget.moc: $(srcdir)/kmdidocumentviewtabwidget.h
++ $(MOC) $(srcdir)/kmdidocumentviewtabwidget.h -o kmdidocumentviewtabwidget.moc
+
#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfourchildren_SOURCES)
- DIST_SOURCES = $(kfourchildren_SOURCES)
- ETAGS = etags
-@@ -102,6 +111,8 @@
+-mocs: kmdichildarea.moc
++mocs: kmdidocumentviewtabwidget.moc
+
+ #>+ 3
+ kmdifocuslist.moc: $(srcdir)/kmdifocuslist.h
+@@ -1147,7 +1151,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdidocumentviewtabwidget.moc kmdichildarea.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmdichildfrmcaption.moc kmditoolviewaccessor.moc
++ -rm -f kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdichildarea.moc kmdidocumentviewtabwidget.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmdichildfrmcaption.moc kmditoolviewaccessor.moc
+
+ #>+ 2
+ KDE_DIST=kmdiguiclient.h Makefile.in kmdidockcontainer.h kmdidocumentviewtabwidget.h kmdifocuslist.h Makefile.am kmditoolviewaccessor_p.h
+@@ -1194,7 +1198,7 @@
+
+
+ #>+ 11
+-libkmdi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdichildarea.cpp $(srcdir)/kmdichildfrm.cpp $(srcdir)/kmdichildfrmcaption.cpp $(srcdir)/kmdichildview.cpp $(srcdir)/kmdimainfrm.cpp $(srcdir)/kmditaskbar.cpp $(srcdir)/kmdidockcontainer.cpp $(srcdir)/kmditoolviewaccessor.cpp $(srcdir)/kmdiguiclient.cpp $(srcdir)/kmdidocumentviewtabwidget.cpp $(srcdir)/kmdifocuslist.cpp kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdidocumentviewtabwidget.moc kmdichildarea.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmditoolviewaccessor.moc kmdichildfrmcaption.moc
++libkmdi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdichildarea.cpp $(srcdir)/kmdichildfrm.cpp $(srcdir)/kmdichildfrmcaption.cpp $(srcdir)/kmdichildview.cpp $(srcdir)/kmdimainfrm.cpp $(srcdir)/kmditaskbar.cpp $(srcdir)/kmdidockcontainer.cpp $(srcdir)/kmditoolviewaccessor.cpp $(srcdir)/kmdiguiclient.cpp $(srcdir)/kmdidocumentviewtabwidget.cpp $(srcdir)/kmdifocuslist.cpp kmdichildview.moc kmdiguiclient.moc kmdichildfrm.moc kmdichildarea.moc kmdidocumentviewtabwidget.moc kmdifocuslist.moc kmditaskbar.moc kmdidockcontainer.moc kmdimainfrm.moc kmditoolviewaccessor.moc kmdichildfrmcaption.moc
+ @echo 'creating libkmdi_la.all_cpp.cpp ...'; \
+ rm -f libkmdi_la.all_cpp.files libkmdi_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
+--- kmdi/test/Makefile.in
++++ kmdi/test/Makefile.in
+@@ -102,6 +102,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -51769,7 +26887,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -143,8 +154,6 @@
+@@ -143,8 +145,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -51778,7 +26896,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -221,7 +230,6 @@
+@@ -221,7 +221,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -51786,7 +26904,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -258,6 +266,9 @@
+@@ -258,6 +257,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -51796,7 +26914,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,6 +324,7 @@
+@@ -313,6 +315,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -51804,16 +26922,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -322,8 +334,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -341,6 +351,7 @@
+@@ -341,6 +344,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -51821,7 +26930,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -508,7 +519,7 @@
+@@ -508,7 +512,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -51830,7 +26939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +557,9 @@
+@@ -546,9 +550,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51842,152 +26951,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -575,21 +586,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -701,7 +715,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- knewstuff/Makefile.in
+++ knewstuff/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,6 +18,8 @@
-
-
-
-+SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) $(khotnewstuff_SOURCES) $(testnewstuff_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -59,15 +61,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(knewstuffdir)" \
-- "$(DESTDIR)$(knsdir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(knewstuffdir)" "$(DESTDIR)$(knsdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -105,24 +99,61 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/downloaddialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo ./$(DEPDIR)/entry.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ghns.Po ./$(DEPDIR)/khotnewstuff.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuff.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffbutton.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffgeneric.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffsecure.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/provider.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/providerdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/security.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testnewstuff.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/uploaddialog.Plo
-+#>+ 24
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libknewstuff_la.all_cpp.P ./$(DEPDIR)/downloaddialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo ./$(DEPDIR)/entry.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghns.Po ./$(DEPDIR)/khotnewstuff.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuff.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffgeneric.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffsecure.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/provider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/providerdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/security.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testnewstuff.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/uploaddialog.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/downloaddialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo ./$(DEPDIR)/entry.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghns.Po ./$(DEPDIR)/khotnewstuff.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuff.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffbutton.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffgeneric.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffsecure.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/provider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/providerdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/security.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testnewstuff.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uploaddialog.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) \
- $(khotnewstuff_SOURCES) $(testnewstuff_SOURCES)
- DIST_SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) \
-@@ -149,6 +180,8 @@
+@@ -149,6 +149,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -51996,7 +26962,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -190,8 +223,6 @@
+@@ -190,8 +192,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -52005,7 +26971,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -268,7 +299,6 @@
+@@ -268,7 +268,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -52013,7 +26979,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -305,6 +335,9 @@
+@@ -305,6 +304,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -52023,7 +26989,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -360,6 +393,7 @@
+@@ -360,6 +362,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -52031,16 +26997,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +403,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -388,6 +420,7 @@
+@@ -388,6 +391,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -52048,7 +27005,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -575,7 +608,7 @@
+@@ -575,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52057,7 +27014,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,16 +646,16 @@
+@@ -613,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52069,118 +27026,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -630,8 +663,8 @@
+@@ -1157,17 +1161,17 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -709,21 +742,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -740,7 +776,7 @@
- test -z "$(kde_confdir)" || $(mkdir_p) "$(DESTDIR)$(kde_confdir)"
- @list='$(kde_conf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_confdir)/$$f'"; \
- $(kde_confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_confdir)/$$f"; \
- done
-@@ -748,7 +784,7 @@
- uninstall-kde_confDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_conf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_confdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_confdir)/$$f"; \
- done
-@@ -757,7 +793,7 @@
- test -z "$(knewstuffdir)" || $(mkdir_p) "$(DESTDIR)$(knewstuffdir)"
- @list='$(knewstuff_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(knewstuffDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(knewstuffdir)/$$f'"; \
- $(knewstuffDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(knewstuffdir)/$$f"; \
- done
-@@ -765,7 +801,7 @@
- uninstall-knewstuffDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(knewstuff_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(knewstuffdir)/$$f'"; \
- rm -f "$(DESTDIR)$(knewstuffdir)/$$f"; \
- done
-@@ -774,7 +810,7 @@
- test -z "$(knsdir)" || $(mkdir_p) "$(DESTDIR)$(knsdir)"
- @list='$(kns_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(knsHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(knsdir)/$$f'"; \
- $(knsHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(knsdir)/$$f"; \
- done
-@@ -782,7 +818,7 @@
- uninstall-knsHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kns_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(knsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(knsdir)/$$f"; \
- done
-@@ -891,7 +927,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1157,17 +1193,17 @@
-
#>+ 13
install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
@@ -52202,103 +27049,7 @@
force-reedit:
--- kparts/Makefile.in
+++ kparts/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,6 +19,8 @@
-
-
-
-+SOURCES = $(libkparts_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(kpartsincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kpartsincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -85,24 +80,52 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/browserextension.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/browserinterface.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/browserrun.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dockmainwindow.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/event.Plo ./$(DEPDIR)/factory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/historyprovider.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo ./$(DEPDIR)/part.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/partmanager.Plo ./$(DEPDIR)/plugin.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/statusbarextension.Plo
-+#>+ 18
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkparts_la.all_cpp.P ./$(DEPDIR)/browserextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserrun.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockmainwindow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/event.Plo ./$(DEPDIR)/factory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/historyprovider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo ./$(DEPDIR)/part.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/partmanager.Plo ./$(DEPDIR)/plugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarextension.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/browserextension.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserinterface.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserrun.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockmainwindow.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/event.Plo ./$(DEPDIR)/factory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/historyprovider.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo ./$(DEPDIR)/part.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/partmanager.Plo ./$(DEPDIR)/plugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarextension.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkparts_la_SOURCES)
- DIST_SOURCES = $(libkparts_la_SOURCES)
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
-@@ -126,6 +149,8 @@
+@@ -126,6 +126,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -52307,7 +27058,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -167,8 +192,6 @@
+@@ -167,8 +169,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -52316,7 +27067,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -245,7 +268,6 @@
+@@ -245,7 +245,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -52324,7 +27075,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -282,6 +304,9 @@
+@@ -282,6 +281,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -52334,7 +27085,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -337,6 +362,7 @@
+@@ -337,6 +339,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -52342,16 +27093,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -346,8 +372,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -365,6 +389,7 @@
+@@ -365,6 +368,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -52359,7 +27101,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -551,7 +576,7 @@
+@@ -551,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52368,7 +27110,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,16 +614,16 @@
+@@ -589,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52380,101 +27122,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -606,8 +631,8 @@
+@@ -1002,13 +1006,6 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -649,21 +674,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -680,7 +708,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -688,7 +716,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -697,7 +725,7 @@
- test -z "$(kpartsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kpartsincludedir)"
- @list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kpartsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kpartsincludedir)/$$f'"; \
- $(kpartsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kpartsincludedir)/$$f"; \
- done
-@@ -705,7 +733,7 @@
- uninstall-kpartsincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kpartsincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kpartsincludedir)/$$f"; \
- done
-@@ -813,7 +841,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1002,13 +1030,6 @@
-
-
#>+ 3
-factory.moc: $(srcdir)/factory.h
- $(MOC) $(srcdir)/factory.h -o factory.moc
@@ -52486,7 +27136,7 @@
plugin.moc: $(srcdir)/plugin.h
$(MOC) $(srcdir)/plugin.h -o plugin.moc
-@@ -1023,6 +1044,13 @@
+@@ -1023,6 +1020,13 @@
mocs: dockmainwindow.moc
#>+ 3
@@ -52500,7 +27150,7 @@
historyprovider.moc: $(srcdir)/historyprovider.h
$(MOC) $(srcdir)/historyprovider.h -o historyprovider.moc
-@@ -1080,7 +1108,7 @@
+@@ -1080,7 +1084,7 @@
#>+ 3
clean-metasources:
@@ -52509,7 +27159,7 @@
#>+ 2
KDE_DIST=krop.desktop Makefile.in COMMENTS design.h krwp.desktop kpart.desktop browserview.desktop Makefile.am
-@@ -1131,7 +1159,7 @@
+@@ -1131,7 +1135,7 @@
#>+ 11
@@ -52520,93 +27170,7 @@
echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
--- kparts/tests/Makefile.in
+++ kparts/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libnotepad_la_SOURCES) $(libnotepadpart_la_SOURCES) $(libspellcheckplugin_la_SOURCES) $(ghostviewtest_SOURCES) $(kpartstest_SOURCES) $(normalktmtest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,16 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(ghostviewtestdir)" "$(DESTDIR)$(notepaddir)" \
-- "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(rcdir)" \
-- "$(DESTDIR)$(testpartdir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(ghostviewtestdir)" "$(DESTDIR)$(notepaddir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(testpartdir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
- libnotepad_la_LIBADD =
-@@ -107,24 +100,40 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/example.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ghostview.Po ./$(DEPDIR)/normalktm.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/notepad.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/notepadpart.Plo ./$(DEPDIR)/parts.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_spellcheck.Plo
-+#>+ 10
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kpartstest.all_cpp.P $(DEPDIR)/normalktmtest.all_cpp.P ./$(DEPDIR)/example.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghostview.Po ./$(DEPDIR)/normalktm.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepad.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepadpart.Plo ./$(DEPDIR)/parts.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_spellcheck.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/example.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghostview.Po ./$(DEPDIR)/normalktm.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepad.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepadpart.Plo ./$(DEPDIR)/parts.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_spellcheck.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libnotepad_la_SOURCES) $(libnotepadpart_la_SOURCES) \
- $(libspellcheckplugin_la_SOURCES) $(ghostviewtest_SOURCES) \
- $(kpartstest_SOURCES) $(normalktmtest_SOURCES)
-@@ -155,6 +164,8 @@
+@@ -155,6 +155,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -52615,7 +27179,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -196,8 +207,6 @@
+@@ -196,8 +198,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -52624,7 +27188,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -274,7 +283,6 @@
+@@ -274,7 +274,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -52632,7 +27196,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -311,6 +319,9 @@
+@@ -311,6 +310,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -52642,7 +27206,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,6 +377,7 @@
+@@ -366,6 +368,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -52650,16 +27214,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,8 +387,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -394,6 +404,7 @@
+@@ -394,6 +397,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -52667,7 +27222,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -588,7 +599,7 @@
+@@ -588,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52676,7 +27231,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,16 +637,16 @@
+@@ -626,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52688,153 +27243,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -643,8 +654,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -713,21 +724,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -744,7 +758,7 @@
- test -z "$(ghostviewtestdir)" || $(mkdir_p) "$(DESTDIR)$(ghostviewtestdir)"
- @list='$(ghostviewtest_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(ghostviewtestDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ghostviewtestdir)/$$f'"; \
- $(ghostviewtestDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ghostviewtestdir)/$$f"; \
- done
-@@ -752,7 +766,7 @@
- uninstall-ghostviewtestDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(ghostviewtest_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(ghostviewtestdir)/$$f'"; \
- rm -f "$(DESTDIR)$(ghostviewtestdir)/$$f"; \
- done
-@@ -761,7 +775,7 @@
- test -z "$(notepaddir)" || $(mkdir_p) "$(DESTDIR)$(notepaddir)"
- @list='$(notepad_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(notepadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(notepaddir)/$$f'"; \
- $(notepadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(notepaddir)/$$f"; \
- done
-@@ -769,7 +783,7 @@
- uninstall-notepadDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(notepad_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(notepaddir)/$$f'"; \
- rm -f "$(DESTDIR)$(notepaddir)/$$f"; \
- done
-@@ -778,7 +792,7 @@
- test -z "$(pluginsdir)" || $(mkdir_p) "$(DESTDIR)$(pluginsdir)"
- @list='$(plugins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pluginsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pluginsdir)/$$f'"; \
- $(pluginsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pluginsdir)/$$f"; \
- done
-@@ -786,7 +800,7 @@
- uninstall-pluginsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(plugins_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(pluginsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pluginsdir)/$$f"; \
- done
-@@ -795,7 +809,7 @@
- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
- @list='$(rc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
- $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -803,7 +817,7 @@
- uninstall-rcDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(rc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
- rm -f "$(DESTDIR)$(rcdir)/$$f"; \
- done
-@@ -812,7 +826,7 @@
- test -z "$(testpartdir)" || $(mkdir_p) "$(DESTDIR)$(testpartdir)"
- @list='$(testpart_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(testpartDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(testpartdir)/$$f'"; \
- $(testpartDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(testpartdir)/$$f"; \
- done
-@@ -820,7 +834,7 @@
- uninstall-testpartDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(testpart_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(testpartdir)/$$f'"; \
- rm -f "$(DESTDIR)$(testpartdir)/$$f"; \
- done
-@@ -927,7 +941,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1030,6 +1044,13 @@
+@@ -1030,6 +1034,13 @@
mocs: ghostview.moc
#>+ 3
@@ -52848,7 +27257,7 @@
normalktm.moc: $(srcdir)/normalktm.h
$(MOC) $(srcdir)/normalktm.h -o normalktm.moc
-@@ -1044,13 +1065,6 @@
+@@ -1044,13 +1055,6 @@
mocs: example.moc
#>+ 3
@@ -52862,7 +27271,7 @@
parts.moc: $(srcdir)/parts.h
$(MOC) $(srcdir)/parts.h -o parts.moc
-@@ -1084,7 +1098,7 @@
+@@ -1084,7 +1088,7 @@
#>+ 3
clean-metasources:
@@ -52873,104 +27282,7 @@
KDE_DIST=plugin_spellcheck.h plugin_foobar.rc notepadpart.rc plugin_spellcheck.rc parts.h Makefile.in ghostview.h notepad.desktop kpartstest_part1.rc kpartstest_shell.rc normalktm.h notepad.h ghostviewtest_shell.rc example.h Makefile.am
--- kresources/Makefile.in
+++ kresources/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kcm_kresources_la_SOURCES) $(libkresources_la_SOURCES) $(testresources_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,15 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(xdg_appsdir)" \
-- "$(DESTDIR)$(kresincludedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(xdg_appsdir)" "$(DESTDIR)$(kresincludedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-@@ -93,24 +87,52 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/configdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/configpage.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/factory.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmkresources.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/managerimpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testresources.Po
-+#>+ 18
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/manageriface_skel.P $(DEPDIR)/manageriface_stub.P $(DEPDIR)/libkresources_la.all_cpp.P ./$(DEPDIR)/configdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/factory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmkresources.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/managerimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testresources.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/manageriface_skel.P $(DEPDIR)/manageriface_stub.P ./$(DEPDIR)/configdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configpage.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/factory.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmkresources.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/managerimpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testresources.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kresources_la_SOURCES) $(libkresources_la_SOURCES) \
- $(testresources_SOURCES)
- DIST_SOURCES = $(kcm_kresources_la_SOURCES) \
-@@ -137,6 +159,8 @@
+@@ -137,6 +137,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -52979,7 +27291,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -178,8 +202,6 @@
+@@ -178,8 +180,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -52988,7 +27300,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -256,7 +278,6 @@
+@@ -256,7 +256,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -52996,7 +27308,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -293,6 +314,9 @@
+@@ -293,6 +292,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -53006,7 +27318,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,6 +372,7 @@
+@@ -348,6 +350,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -53014,16 +27326,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +382,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -376,6 +399,7 @@
+@@ -376,6 +379,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -53031,7 +27334,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -588,7 +612,7 @@
+@@ -588,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53040,7 +27343,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,16 +650,16 @@
+@@ -626,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53052,139 +27355,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -643,8 +667,8 @@
+@@ -1104,18 +1108,18 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -662,7 +686,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -670,8 +694,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -725,21 +749,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -756,7 +783,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -764,7 +791,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -773,7 +800,7 @@
- test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)"
- @list='$(xdg_apps_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(xdg_appsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
- $(xdg_appsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_appsdir)/$$f"; \
- done
-@@ -781,7 +808,7 @@
- uninstall-xdg_appsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(xdg_apps_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(xdg_appsdir)/$$f"; \
- done
-@@ -790,7 +817,7 @@
- test -z "$(kresincludedir)" || $(mkdir_p) "$(DESTDIR)$(kresincludedir)"
- @list='$(kresinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kresincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kresincludedir)/$$f'"; \
- $(kresincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kresincludedir)/$$f"; \
- done
-@@ -798,7 +825,7 @@
- uninstall-kresincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kresinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kresincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kresincludedir)/$$f"; \
- done
-@@ -906,7 +933,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1104,18 +1131,18 @@
-
-
#>+ 3
-resource.moc: $(srcdir)/resource.h
- $(MOC) $(srcdir)/resource.h -o resource.moc
@@ -53207,7 +27380,7 @@
#>+ 3
configdialog.moc: $(srcdir)/configdialog.h
-@@ -1157,7 +1184,7 @@
+@@ -1157,7 +1161,7 @@
#>+ 3
clean-metasources:
@@ -53218,28 +27391,7 @@
KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am
--- kspell2/Makefile.in
+++ kspell2/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libkspell2base_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,9 +59,7 @@
+@@ -57,9 +57,7 @@
$(top_builddir)/kjs/global.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -53250,73 +27402,7 @@
am_libkspell2base_la_OBJECTS = settings.lo broker.lo client.lo \
filter.lo backgroundchecker.lo backgroundthread.lo \
backgroundengine.lo defaultdictionary.lo
-@@ -74,24 +74,43 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/backgroundchecker.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/backgroundengine.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/backgroundthread.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/broker.Plo ./$(DEPDIR)/client.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/defaultdictionary.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/settings.Plo
-+#>+ 12
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkspell2base_la.all_cpp.P ./$(DEPDIR)/backgroundchecker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundengine.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundthread.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/broker.Plo ./$(DEPDIR)/client.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultdictionary.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/settings.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/backgroundchecker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundengine.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundthread.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/broker.Plo ./$(DEPDIR)/client.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultdictionary.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/settings.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkspell2base_la_SOURCES)
- DIST_SOURCES = $(libkspell2base_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -107,14 +126,7 @@
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive nmcheck-recursive bcheck-recursive
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(servicetypedir)" \
-- "$(DESTDIR)$(kspell2baseincludedir)"
-+am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kspell2baseincludedir)"
- servicetypeDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(servicetype_DATA)
- kspell2baseincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -137,6 +149,8 @@
+@@ -137,6 +135,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -53325,7 +27411,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -178,8 +192,6 @@
+@@ -178,8 +178,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -53334,7 +27420,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -256,7 +268,6 @@
+@@ -256,7 +254,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -53342,7 +27428,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -293,6 +304,9 @@
+@@ -293,6 +290,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -53352,7 +27438,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -348,6 +362,7 @@
+@@ -348,6 +348,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -53360,16 +27446,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +372,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -376,6 +389,7 @@
+@@ -376,6 +377,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -53377,7 +27454,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -549,7 +563,6 @@
+@@ -549,7 +551,6 @@
#>- libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
#>+ 1
libkspell2base_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
@@ -53385,7 +27462,7 @@
servicetype_DATA = kspellclient.desktop
servicetypedir = $(kde_servicetypesdir)
#>- all: all-recursive
-@@ -558,7 +571,7 @@
+@@ -558,7 +559,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53394,7 +27471,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +609,9 @@
+@@ -596,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53406,164 +27483,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -634,21 +647,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -665,7 +681,7 @@
- test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
- @list='$(servicetype_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
- $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -673,7 +689,7 @@
- uninstall-servicetypeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(servicetype_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
- done
-@@ -682,7 +698,7 @@
- test -z "$(kspell2baseincludedir)" || $(mkdir_p) "$(DESTDIR)$(kspell2baseincludedir)"
- @list='$(kspell2baseinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kspell2baseincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kspell2baseincludedir)/$$f'"; \
- $(kspell2baseincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kspell2baseincludedir)/$$f"; \
- done
-@@ -690,7 +706,7 @@
- uninstall-kspell2baseincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kspell2baseinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kspell2baseincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kspell2baseincludedir)/$$f"; \
- done
-@@ -702,13 +718,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -720,7 +730,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -728,13 +738,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -755,7 +759,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -855,17 +859,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -897,7 +899,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kspell2/plugins/Makefile.in
-+++ kspell2/plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
+--- kspell2/plugins/aspell/Makefile.in
++++ kspell2/plugins/aspell/Makefile.in
+@@ -115,6 +115,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -53572,7 +27494,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
+@@ -156,8 +158,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -53581,7 +27503,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
+@@ -234,7 +234,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -53589,7 +27511,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
+@@ -271,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -53599,7 +27521,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
+@@ -326,6 +328,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -53607,16 +27529,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -354,6 +357,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -53624,16 +27537,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -487,7 +489,7 @@
- all: docs-am all-recursive
+@@ -530,7 +534,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*) \
-@@ -525,9 +527,9 @@
+@@ -568,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53643,161 +27556,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -547,13 +549,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -565,7 +561,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -573,13 +569,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -600,7 +590,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -702,14 +692,12 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -738,7 +726,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kspell2/plugins/aspell/Makefile.in
-+++ kspell2/plugins/aspell/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kspell_aspell_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kspell_aspell_la_DEPENDENCIES = ../../ui/libkspell2.la
-@@ -76,24 +71,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kspell_aspellclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_aspelldict.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell_aspell_la.all_cpp.P ./$(DEPDIR)/kspell_aspellclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_aspelldict.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kspell_aspellclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_aspelldict.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kspell_aspell_la_SOURCES)
- DIST_SOURCES = $(kspell_aspell_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -115,6 +117,8 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kspell2/plugins/hspell/Makefile.in
++++ kspell2/plugins/hspell/Makefile.in
+@@ -115,6 +115,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -53806,7 +27569,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -156,8 +160,6 @@
+@@ -156,8 +158,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -53815,7 +27578,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -234,7 +236,6 @@
+@@ -234,7 +234,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -53823,7 +27586,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -271,6 +272,9 @@
+@@ -271,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -53833,7 +27596,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -326,6 +328,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -53841,15 +27604,6 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -335,8 +340,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
@@ -354,6 +357,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
@@ -53867,7 +27621,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,16 +572,16 @@
+@@ -568,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53879,158 +27633,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -585,8 +589,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -618,21 +622,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -649,7 +656,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -657,7 +664,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -763,7 +770,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kspell2/plugins/hspell/Makefile.in
-+++ kspell2/plugins/hspell/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kspell_hspell_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kspell_hspell_la_DEPENDENCIES = ../../ui/libkspell2.la
-@@ -76,24 +71,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kspell_hspellclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_hspelldict.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell_hspell_la.all_cpp.P ./$(DEPDIR)/kspell_hspellclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_hspelldict.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kspell_hspellclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_hspelldict.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kspell_hspell_la_SOURCES)
- DIST_SOURCES = $(kspell_hspell_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -115,6 +117,8 @@
+--- kspell2/plugins/ispell/Makefile.in
++++ kspell2/plugins/ispell/Makefile.in
+@@ -117,6 +117,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -54039,7 +27644,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -156,8 +160,6 @@
+@@ -158,8 +160,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -54048,7 +27653,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -234,7 +236,6 @@
+@@ -236,7 +236,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -54056,7 +27661,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -271,6 +272,9 @@
+@@ -273,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -54066,7 +27671,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -328,6 +330,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -54074,16 +27679,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -335,8 +340,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -354,6 +357,7 @@
+@@ -356,6 +359,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -54091,7 +27687,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -530,7 +534,7 @@
+@@ -540,7 +544,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -54100,7 +27696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,16 +572,16 @@
+@@ -578,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54112,173 +27708,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -585,8 +589,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -618,21 +622,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -649,7 +656,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -657,7 +664,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -763,7 +770,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kspell2/plugins/ispell/Makefile.in
-+++ kspell2/plugins/ispell/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kspell_ispell_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -53,14 +55,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-- "$(DESTDIR)$(servicedir)"
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- kspell_ispell_la_DEPENDENCIES = ../../ui/libkspell2.la
-@@ -78,24 +73,46 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/correct.Plo ./$(DEPDIR)/good.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/hash.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/ispell_checker.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispellclient.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispelldict.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/makedent.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/tgood.Plo
-+#>+ 14
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell_ispell_la.all_cpp.P ./$(DEPDIR)/correct.Plo ./$(DEPDIR)/good.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/hash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ispell_checker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispellclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispelldict.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/makedent.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tgood.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/correct.Plo ./$(DEPDIR)/good.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/hash.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ispell_checker.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispellclient.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispelldict.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/makedent.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tgood.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kspell_ispell_la_SOURCES)
- DIST_SOURCES = $(kspell_ispell_la_SOURCES)
- serviceDATA_INSTALL = $(INSTALL_DATA)
-@@ -117,6 +134,8 @@
+--- kspell2/plugins/Makefile.in
++++ kspell2/plugins/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -54287,7 +27719,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -158,8 +177,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -54296,7 +27728,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -236,7 +253,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -54304,7 +27736,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -273,6 +289,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -54314,7 +27746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,6 +347,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -54322,16 +27754,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -337,8 +357,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -356,6 +374,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -54339,16 +27762,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -540,7 +559,7 @@
+@@ -487,7 +491,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*) \
-@@ -578,16 +597,16 @@
+@@ -525,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54358,106 +27781,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -595,8 +614,8 @@
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -635,21 +654,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -666,7 +688,7 @@
- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
- @list='$(service_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -674,7 +696,7 @@
- uninstall-serviceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(service_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
- rm -f "$(DESTDIR)$(servicedir)/$$f"; \
- done
-@@ -780,7 +802,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kspell2/tests/Makefile.in
+++ kspell2/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(backgroundtest_SOURCES) $(test_SOURCES) $(test_configdialog_SOURCES) $(test_dialog_SOURCES) $(test_filter_SOURCES) $(test_highlighter_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -71,7 +73,8 @@
+@@ -71,7 +71,8 @@
#>+ 1
test_configdialog_OBJECTS = test_configdialog.$(OBJEXT)
test_configdialog_DEPENDENCIES = ../ui/libkspell2_noinst.la \
@@ -54467,7 +27795,7 @@
am_test_dialog_OBJECTS = test_dialog.$(OBJEXT)
#>- test_dialog_OBJECTS = $(am_test_dialog_OBJECTS)
#>+ 1
-@@ -87,28 +90,42 @@
+@@ -87,7 +88,8 @@
#>+ 1
test_highlighter_OBJECTS = test_highlighter.$(OBJEXT)
test_highlighter_DEPENDENCIES = ../ui/libkspell2_noinst.la \
@@ -54477,47 +27805,7 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/backgroundtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_configdialog.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_dialog.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_filter.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_highlighter.Po
-+#>+ 6
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backgroundtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_configdialog.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dialog.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_filter.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_highlighter.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(backgroundtest_SOURCES) $(test_SOURCES) \
- $(test_configdialog_SOURCES) $(test_dialog_SOURCES) \
- $(test_filter_SOURCES) $(test_highlighter_SOURCES)
-@@ -132,6 +149,8 @@
+@@ -132,6 +134,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -54526,7 +27814,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -173,8 +192,6 @@
+@@ -173,8 +177,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -54535,7 +27823,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -251,7 +268,6 @@
+@@ -251,7 +253,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -54543,7 +27831,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -288,6 +304,9 @@
+@@ -288,6 +289,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -54553,7 +27841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -343,6 +362,7 @@
+@@ -343,6 +347,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -54561,16 +27849,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -352,8 +372,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -371,6 +389,7 @@
+@@ -371,6 +376,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -54578,7 +27857,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -538,16 +557,16 @@
+@@ -538,16 +544,16 @@
test_dialog_SOURCES = test_dialog.cpp
test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
test_highlighter_SOURCES = test_highlighter.cpp
@@ -54598,7 +27877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +604,9 @@
+@@ -585,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54610,79 +27889,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -632,21 +651,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -758,7 +780,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kspell2/ui/Makefile.in
+++ kspell2/ui/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkspell2_la_SOURCES) $(libkspell2_noinst_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,17 +56,12 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kspell2includedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kspell2includedir)"
+@@ -64,7 +64,9 @@
+ "$(DESTDIR)$(kspell2includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-libkspell2_la_DEPENDENCIES = libkspell2_noinst.la ../libkspell2base.la
@@ -54692,48 +27902,7 @@
am_libkspell2_la_OBJECTS = dialog.lo
#>- libkspell2_la_OBJECTS = $(am_libkspell2_la_OBJECTS)
#>+ 1
-@@ -82,24 +79,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/configdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/highlighter.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell2ui.P $(DEPDIR)/configui.P $(DEPDIR)/libkspell2_noinst_la.all_cpp.P ./$(DEPDIR)/configdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/highlighter.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kspell2ui.P $(DEPDIR)/configui.P ./$(DEPDIR)/configdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/highlighter.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkspell2_la_SOURCES) $(libkspell2_noinst_la_SOURCES)
- DIST_SOURCES = $(libkspell2_la_SOURCES) \
- $(libkspell2_noinst_la_SOURCES)
-@@ -122,6 +129,8 @@
+@@ -122,6 +124,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -54742,7 +27911,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -163,8 +172,6 @@
+@@ -163,8 +167,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -54751,7 +27920,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -241,7 +248,6 @@
+@@ -241,7 +243,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -54759,7 +27928,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -278,6 +284,9 @@
+@@ -278,6 +279,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -54769,7 +27938,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -333,6 +342,7 @@
+@@ -333,6 +337,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -54777,16 +27946,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -342,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -361,6 +369,7 @@
+@@ -361,6 +366,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -54794,7 +27954,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -537,14 +546,14 @@
+@@ -537,14 +543,14 @@
#>- libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
#>+ 1
libkspell2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0:0 $(all_libraries)
@@ -54811,7 +27971,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,16 +591,16 @@
+@@ -582,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54823,95 +27983,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -599,8 +608,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -645,21 +654,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -676,7 +688,7 @@
- test -z "$(kspell2includedir)" || $(mkdir_p) "$(DESTDIR)$(kspell2includedir)"
- @list='$(kspell2include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kspell2includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kspell2includedir)/$$f'"; \
- $(kspell2includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kspell2includedir)/$$f"; \
- done
-@@ -684,7 +696,7 @@
- uninstall-kspell2includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(kspell2include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kspell2includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(kspell2includedir)/$$f"; \
- done
-@@ -790,7 +802,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/Makefile.in
-+++ kstyles/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
+--- kstyles/highcolor/Makefile.in
++++ kstyles/highcolor/Makefile.in
+@@ -128,6 +128,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -54920,7 +27994,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
+@@ -169,8 +171,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -54929,7 +28003,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
+@@ -247,7 +247,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -54937,7 +28011,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
+@@ -284,6 +283,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -54947,7 +28021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
+@@ -339,6 +341,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -54955,16 +28029,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -367,6 +370,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -54972,16 +28037,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +487,7 @@
- all: docs-am all-recursive
+@@ -537,7 +541,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*) \
-@@ -523,9 +525,9 @@
+@@ -575,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54991,158 +28056,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/highcolor/Makefile.in
-+++ kstyles/highcolor/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(highcolor_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,12 +75,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_styledir)"
- kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_style_LTLIBRARIES)
-@@ -90,24 +86,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/highcolor.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/highcolor.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(highcolor_la_SOURCES)
- DIST_SOURCES = $(highcolor_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -128,6 +127,8 @@
+ install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kstyles/highcontrast/config/Makefile.in
++++ kstyles/highcontrast/config/Makefile.in
+@@ -111,6 +111,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -55151,7 +28069,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -169,8 +170,6 @@
+@@ -152,8 +154,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -55160,7 +28078,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -247,7 +246,6 @@
+@@ -230,7 +230,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -55168,7 +28086,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -284,6 +282,9 @@
+@@ -267,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -55178,7 +28096,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,6 +340,7 @@
+@@ -322,6 +324,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -55186,16 +28104,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -348,8 +350,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -367,6 +367,7 @@
+@@ -350,6 +353,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -55203,7 +28112,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -537,7 +538,7 @@
+@@ -519,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55212,7 +28121,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,16 +576,16 @@
+@@ -557,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55222,138 +28131,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
- @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
- else :; fi; \
-@@ -592,8 +593,8 @@
-
- uninstall-kde_styleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
- done
-@@ -624,21 +625,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -752,7 +756,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kstyles/highcontrast/Makefile.in
+++ kstyles/highcontrast/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
-
-
-
-+SOURCES = $(highcontrast_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,14 +75,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_styledir)" \
-- "$(DESTDIR)$(stylercdir)"
-+am__installdirs = "$(DESTDIR)$(kde_styledir)" "$(DESTDIR)$(stylercdir)"
- kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_style_LTLIBRARIES)
- highcontrast_la_DEPENDENCIES = ../../kdefx/libkdefx.la
-@@ -91,24 +86,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/highcontrast.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/highcontrast.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(highcontrast_la_SOURCES)
- DIST_SOURCES = $(highcontrast_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -145,6 +143,8 @@
+@@ -145,6 +145,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -55362,7 +28144,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -186,8 +186,6 @@
+@@ -186,8 +188,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -55371,7 +28153,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -264,7 +262,6 @@
+@@ -264,7 +264,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -55379,7 +28161,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -301,6 +298,9 @@
+@@ -301,6 +300,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -55389,7 +28171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,6 +356,7 @@
+@@ -356,6 +358,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -55397,16 +28179,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -365,8 +366,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -384,6 +383,7 @@
+@@ -384,6 +387,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -55414,7 +28187,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -560,7 +560,7 @@
+@@ -560,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55423,7 +28196,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,16 +598,16 @@
+@@ -598,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55435,221 +28208,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
- @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
- else :; fi; \
-@@ -615,8 +615,8 @@
-
- uninstall-kde_styleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
- done
-@@ -647,21 +647,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -678,7 +681,7 @@
- test -z "$(stylercdir)" || $(mkdir_p) "$(DESTDIR)$(stylercdir)"
- @list='$(stylerc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(stylercDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(stylercdir)/$$f'"; \
- $(stylercDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(stylercdir)/$$f"; \
- done
-@@ -686,7 +689,7 @@
- uninstall-stylercDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(stylerc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(stylercdir)/$$f'"; \
- rm -f "$(DESTDIR)$(stylercdir)/$$f"; \
- done
-@@ -698,13 +701,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -716,7 +713,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -724,13 +721,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -751,7 +742,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -850,17 +841,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -892,7 +881,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
- maintainer-clean-generic:
---- kstyles/highcontrast/config/Makefile.in
-+++ kstyles/highcontrast/config/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -73,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/highcontrastconfig.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/highcontrastconfig.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
- DIST_SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -111,6 +110,8 @@
+--- kstyles/keramik/Makefile.in
++++ kstyles/keramik/Makefile.in
+@@ -122,6 +122,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -55658,7 +28219,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -152,8 +153,6 @@
+@@ -163,8 +165,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -55667,7 +28228,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -230,7 +229,6 @@
+@@ -241,7 +241,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -55675,7 +28236,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -267,6 +265,9 @@
+@@ -278,6 +277,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -55685,7 +28246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,6 +323,7 @@
+@@ -333,6 +335,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -55693,16 +28254,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -331,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -350,6 +350,7 @@
+@@ -361,6 +364,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -55710,7 +28262,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -519,7 +520,7 @@
+@@ -537,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55719,7 +28271,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,16 +558,16 @@
+@@ -575,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55729,145 +28281,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -574,8 +575,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -606,21 +607,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -734,7 +738,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/keramik/Makefile.in
-+++ kstyles/keramik/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,12 +58,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_styledir)"
- kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_style_LTLIBRARIES)
-@@ -84,24 +80,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/colorutil.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/genembed.Po ./$(DEPDIR)/gradients.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/keramik.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/pixmaploader.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/keramik_la.all_cpp.P ./$(DEPDIR)/colorutil.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/genembed.Po ./$(DEPDIR)/gradients.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keramik.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pixmaploader.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/colorutil.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/genembed.Po ./$(DEPDIR)/gradients.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keramik.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pixmaploader.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
- DIST_SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -122,6 +131,8 @@
+--- kstyles/klegacy/Makefile.in
++++ kstyles/klegacy/Makefile.in
+@@ -113,6 +113,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -55876,7 +28294,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -163,8 +174,6 @@
+@@ -154,8 +156,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -55885,7 +28303,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -241,7 +250,6 @@
+@@ -232,7 +232,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -55893,7 +28311,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -278,6 +286,9 @@
+@@ -269,6 +268,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -55903,7 +28321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -333,6 +344,7 @@
+@@ -324,6 +326,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -55911,16 +28329,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -342,8 +354,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -361,6 +371,7 @@
+@@ -352,6 +355,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -55928,7 +28337,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -537,7 +548,7 @@
+@@ -523,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55937,7 +28346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,16 +586,16 @@
+@@ -561,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55947,139 +28356,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
- @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
- else :; fi; \
-@@ -592,8 +603,8 @@
-
- uninstall-kde_styleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
- done
-@@ -638,21 +649,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -766,7 +780,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/klegacy/Makefile.in
-+++ kstyles/klegacy/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(klegacystyle_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -75,24 +71,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/klegacystyle.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/klegacystyle_la.all_cpp.P ./$(DEPDIR)/klegacystyle.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/klegacystyle.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(klegacystyle_la_SOURCES)
- DIST_SOURCES = $(klegacystyle_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -113,6 +116,8 @@
+--- kstyles/kthemestyle/Makefile.in
++++ kstyles/kthemestyle/Makefile.in
+@@ -132,6 +132,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -56088,7 +28369,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -154,8 +159,6 @@
+@@ -173,8 +175,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -56097,7 +28378,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -232,7 +235,6 @@
+@@ -251,7 +251,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -56105,7 +28386,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -269,6 +271,9 @@
+@@ -288,6 +287,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -56115,7 +28396,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -324,6 +329,7 @@
+@@ -343,6 +345,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -56123,16 +28404,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -333,8 +339,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -352,6 +356,7 @@
+@@ -371,6 +374,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -56140,7 +28412,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -523,7 +528,7 @@
+@@ -541,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56149,7 +28421,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,16 +566,16 @@
+@@ -579,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56159,142 +28431,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -578,8 +583,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -611,21 +616,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -739,7 +747,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/kthemestyle/Makefile.in
-+++ kstyles/kthemestyle/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(kthemestyle_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,12 +75,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_styledir)"
- kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_style_LTLIBRARIES)
-@@ -94,24 +90,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kstyledirs.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kthemebase.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kthemestyle.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kthemestyle_la.all_cpp.P ./$(DEPDIR)/kstyledirs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemestyle.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kstyledirs.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemebase.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemestyle.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kthemestyle_la_SOURCES)
- DIST_SOURCES = $(kthemestyle_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -132,6 +138,8 @@
+--- kstyles/light/Makefile.in
++++ kstyles/light/Makefile.in
+@@ -132,6 +132,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -56303,7 +28444,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -173,8 +181,6 @@
+@@ -173,8 +175,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -56312,7 +28453,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -251,7 +257,6 @@
+@@ -251,7 +251,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -56320,7 +28461,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -288,6 +293,9 @@
+@@ -288,6 +287,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -56330,7 +28471,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -343,6 +351,7 @@
+@@ -343,6 +345,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -56338,16 +28479,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -352,8 +361,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -371,6 +378,7 @@
+@@ -371,6 +374,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -56355,7 +28487,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -541,7 +549,7 @@
+@@ -541,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56364,7 +28496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,16 +587,16 @@
+@@ -579,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56376,140 +28508,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
- @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
- else :; fi; \
-@@ -596,8 +604,8 @@
-
- uninstall-kde_styleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
- done
-@@ -630,21 +638,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -758,7 +769,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/light/Makefile.in
-+++ kstyles/light/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -35,6 +35,8 @@
- # Boston, MA 02110-1301, USA.
-
-
-+SOURCES = $(light_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -73,12 +75,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_styledir)"
- kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_style_LTLIBRARIES)
-@@ -94,24 +90,34 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/light.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v2.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v3.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/light_la.all_cpp.P ./$(DEPDIR)/light.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v2.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v3.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/light.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v2.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v3.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(light_la_SOURCES)
- DIST_SOURCES = $(light_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -132,6 +138,8 @@
+--- kstyles/Makefile.in
++++ kstyles/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -56518,7 +28519,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -173,8 +181,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -56527,7 +28528,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -251,7 +257,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -56535,7 +28536,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -288,6 +293,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -56545,7 +28546,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -343,6 +351,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -56553,16 +28554,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -352,8 +361,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -371,6 +378,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -56570,16 +28562,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -541,7 +549,7 @@
+@@ -485,7 +489,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*) \
-@@ -579,16 +587,16 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56589,139 +28581,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
- @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
- else :; fi; \
-@@ -596,8 +604,8 @@
- uninstall-kde_styleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
- done
-@@ -630,21 +638,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -758,7 +769,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/plastik/Makefile.in
-+++ kstyles/plastik/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(plastik_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_styledir)" \
-- "$(DESTDIR)$(stylercdir)"
-+am__installdirs = "$(DESTDIR)$(kde_styledir)" "$(DESTDIR)$(stylercdir)"
- kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_style_LTLIBRARIES)
- plastik_la_DEPENDENCIES = ../../kdefx/libkdefx.la
-@@ -76,24 +71,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/plastik.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/plastik_la.all_cpp.P ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/plastik.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/plastik.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(plastik_la_SOURCES)
- DIST_SOURCES = $(plastik_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -130,6 +129,8 @@
+--- kstyles/plastik/config/Makefile.in
++++ kstyles/plastik/config/Makefile.in
+@@ -111,6 +111,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -56730,7 +28594,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -171,8 +172,6 @@
+@@ -152,8 +154,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -56739,7 +28603,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -249,7 +248,6 @@
+@@ -230,7 +230,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -56747,7 +28611,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -286,6 +284,9 @@
+@@ -267,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -56757,7 +28621,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,6 +342,7 @@
+@@ -322,6 +324,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -56765,16 +28629,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,8 +352,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -369,6 +369,7 @@
+@@ -350,6 +353,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -56782,7 +28637,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -545,7 +546,7 @@
+@@ -519,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56791,7 +28646,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,16 +584,16 @@
+@@ -557,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56801,223 +28656,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
- @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
- else :; fi; \
-@@ -600,8 +601,8 @@
-
- uninstall-kde_styleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
- done
-@@ -633,21 +634,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -664,7 +668,7 @@
- test -z "$(stylercdir)" || $(mkdir_p) "$(DESTDIR)$(stylercdir)"
- @list='$(stylerc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(stylercDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(stylercdir)/$$f'"; \
- $(stylercDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(stylercdir)/$$f"; \
- done
-@@ -672,7 +676,7 @@
- uninstall-stylercDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(stylerc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(stylercdir)/$$f'"; \
- rm -f "$(DESTDIR)$(stylercdir)/$$f"; \
- done
-@@ -684,13 +688,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -702,7 +700,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -710,13 +708,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -737,7 +729,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -836,17 +828,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -878,7 +868,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
- maintainer-clean-generic:
---- kstyles/plastik/config/Makefile.in
-+++ kstyles/plastik/config/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(kstyle_plastik_config_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(kde_moduledir)"
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
-@@ -73,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plastikconf.Plo
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plastikconf.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kstyle_plastik_config_la_SOURCES)
- DIST_SOURCES = $(kstyle_plastik_config_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -111,6 +110,8 @@
+--- kstyles/plastik/Makefile.in
++++ kstyles/plastik/Makefile.in
+@@ -130,6 +130,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -57026,7 +28669,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -152,8 +153,6 @@
+@@ -171,8 +173,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -57035,7 +28678,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -230,7 +229,6 @@
+@@ -249,7 +249,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -57043,7 +28686,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -267,6 +265,9 @@
+@@ -286,6 +285,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -57053,7 +28696,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,6 +323,7 @@
+@@ -341,6 +343,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -57061,16 +28704,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -331,8 +333,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -350,6 +350,7 @@
+@@ -369,6 +372,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -57078,7 +28712,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -519,7 +520,7 @@
+@@ -545,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57087,7 +28721,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,16 +558,16 @@
+@@ -583,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57097,92 +28731,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
-@@ -574,8 +575,8 @@
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-@@ -606,21 +607,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -734,7 +738,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kstyles/riscos/Makefile.in
+++ kstyles/riscos/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(themercdir)"
- pixmapDATA_INSTALL = $(INSTALL_DATA)
- themercDATA_INSTALL = $(INSTALL_DATA)
-@@ -79,6 +73,8 @@
+@@ -79,6 +79,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -57191,7 +28744,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -120,8 +116,6 @@
+@@ -120,8 +122,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -57200,7 +28753,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -198,7 +192,6 @@
+@@ -198,7 +198,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -57208,7 +28761,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -235,6 +228,9 @@
+@@ -235,6 +234,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -57218,7 +28771,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +286,7 @@
+@@ -290,6 +292,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -57226,16 +28779,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -299,8 +296,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -318,6 +313,7 @@
+@@ -318,6 +321,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -57243,7 +28787,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -517,7 +513,7 @@
+@@ -517,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -57252,7 +28796,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +551,9 @@
+@@ -555,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57264,52 +28808,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -574,7 +570,7 @@
- test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
- @list='$(pixmap_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
- $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
- done
-@@ -582,7 +578,7 @@
- uninstall-pixmapDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pixmap_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
- done
-@@ -591,7 +587,7 @@
- test -z "$(themercdir)" || $(mkdir_p) "$(DESTDIR)$(themercdir)"
- @list='$(themerc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(themercDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themercdir)/$$f'"; \
- $(themercDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themercdir)/$$f"; \
- done
-@@ -599,7 +595,7 @@
- uninstall-themercDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(themerc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(themercdir)/$$f'"; \
- rm -f "$(DESTDIR)$(themercdir)/$$f"; \
- done
-@@ -663,7 +659,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -735,7 +731,7 @@
+@@ -735,7 +739,7 @@
.NOEXPORT:
#>+ 2
@@ -57320,35 +28819,7 @@
docs-am:
--- kstyles/themes/Makefile.in
+++ kstyles/themes/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,14 +54,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_confdir)" \
-- "$(DESTDIR)$(kstylethemesdatadir)"
-+am__installdirs = "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(kstylethemesdatadir)"
- kde_confDATA_INSTALL = $(INSTALL_DATA)
- kstylethemesdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(kde_conf_DATA) $(kstylethemesdata_DATA)
-@@ -80,6 +73,8 @@
+@@ -80,6 +80,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -57357,7 +28828,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -121,8 +116,6 @@
+@@ -121,8 +123,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -57366,7 +28837,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -199,7 +192,6 @@
+@@ -199,7 +199,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -57374,7 +28845,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -236,6 +228,9 @@
+@@ -236,6 +235,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -57384,7 +28855,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -291,6 +286,7 @@
+@@ -291,6 +293,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -57392,16 +28863,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,8 +296,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -319,6 +313,7 @@
+@@ -319,6 +322,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -57409,7 +28871,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -489,7 +484,7 @@
+@@ -489,7 +493,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -57418,7 +28880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +522,9 @@
+@@ -527,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57430,66 +28892,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -546,7 +541,7 @@
- test -z "$(kde_confdir)" || $(mkdir_p) "$(DESTDIR)$(kde_confdir)"
- @list='$(kde_conf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_confdir)/$$f'"; \
- $(kde_confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_confdir)/$$f"; \
- done
-@@ -554,7 +549,7 @@
- uninstall-kde_confDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_conf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_confdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_confdir)/$$f"; \
- done
-@@ -563,7 +558,7 @@
- test -z "$(kstylethemesdatadir)" || $(mkdir_p) "$(DESTDIR)$(kstylethemesdatadir)"
- @list='$(kstylethemesdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kstylethemesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kstylethemesdatadir)/$$f'"; \
- $(kstylethemesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kstylethemesdatadir)/$$f"; \
- done
-@@ -571,7 +566,7 @@
- uninstall-kstylethemesdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kstylethemesdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kstylethemesdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kstylethemesdatadir)/$$f"; \
- done
-@@ -635,7 +630,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/utils/Makefile.in
-+++ kstyles/utils/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,8 @@
+--- kstyles/utils/installtheme/Makefile.in
++++ kstyles/utils/installtheme/Makefile.in
+@@ -102,6 +102,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -57498,7 +28903,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -125,8 +127,6 @@
+@@ -143,8 +145,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -57507,7 +28912,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -203,7 +203,6 @@
+@@ -221,7 +221,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -57515,7 +28920,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -240,6 +239,9 @@
+@@ -258,6 +257,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -57525,7 +28930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +297,7 @@
+@@ -313,6 +315,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -57533,16 +28938,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,8 +307,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -323,6 +324,7 @@
+@@ -341,6 +344,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -57550,16 +28946,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +487,7 @@
- all: docs-am all-recursive
+@@ -516,7 +520,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*) \
-@@ -523,9 +525,9 @@
+@@ -554,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57569,145 +28965,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -545,13 +547,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -563,7 +559,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -571,13 +567,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -598,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -697,17 +687,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -736,7 +724,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kstyles/utils/installtheme/Makefile.in
-+++ kstyles/utils/installtheme/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(kinstalltheme_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -65,24 +67,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kinstalltheme_SOURCES)
- DIST_SOURCES = $(kinstalltheme_SOURCES)
- ETAGS = etags
-@@ -102,6 +107,8 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- kstyles/utils/Makefile.in
++++ kstyles/utils/Makefile.in
+@@ -84,6 +84,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -57716,7 +28978,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -143,8 +150,6 @@
+@@ -125,8 +127,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -57725,7 +28987,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -221,7 +226,6 @@
+@@ -203,7 +203,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -57733,7 +28995,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -258,6 +262,9 @@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -57743,7 +29005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,6 +320,7 @@
+@@ -295,6 +297,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -57751,16 +29013,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -322,8 +330,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -341,6 +347,7 @@
+@@ -323,6 +326,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -57768,16 +29021,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -516,7 +523,7 @@
+@@ -485,7 +489,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*) \
-@@ -554,9 +561,9 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57787,123 +29040,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -602,21 +609,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -730,7 +740,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kstyles/web/Makefile.in
+++ kstyles/web/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(webstyle_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -55,14 +57,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kstylewebdatadir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kstylewebdatadir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -77,24 +72,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/webstyle.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/webstyle_la.all_cpp.P ./$(DEPDIR)/plugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/webstyle.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/plugin.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/webstyle.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(webstyle_la_SOURCES)
- DIST_SOURCES = $(webstyle_la_SOURCES)
- kstylewebdataDATA_INSTALL = $(INSTALL_DATA)
-@@ -117,6 +119,8 @@
+@@ -117,6 +117,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -57912,7 +29053,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -158,8 +162,6 @@
+@@ -158,8 +160,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -57921,7 +29062,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -236,7 +238,6 @@
+@@ -236,7 +236,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -57929,7 +29070,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -273,6 +274,9 @@
+@@ -273,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -57939,7 +29080,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,6 +332,7 @@
+@@ -328,6 +330,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -57947,15 +29088,6 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -337,8 +342,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
@@ -356,6 +359,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
@@ -57973,7 +29105,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,16 +571,16 @@
+@@ -567,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57985,164 +29117,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -584,8 +588,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -617,21 +621,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -648,7 +655,7 @@
- test -z "$(kstylewebdatadir)" || $(mkdir_p) "$(DESTDIR)$(kstylewebdatadir)"
- @list='$(kstylewebdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kstylewebdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kstylewebdatadir)/$$f'"; \
- $(kstylewebdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kstylewebdatadir)/$$f"; \
- done
-@@ -656,7 +663,7 @@
- uninstall-kstylewebdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kstylewebdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kstylewebdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(kstylewebdatadir)/$$f"; \
- done
-@@ -762,7 +769,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kunittest/Makefile.in
+++ kunittest/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(kunittest_samplemodule_la_SOURCES) $(libkunittest_la_SOURCES) $(kunittestmodrunner_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,14 +59,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(libkunittestincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libkunittestincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- kunittest_samplemodule_la_DEPENDENCIES = libkunittest.la
-@@ -93,24 +88,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/modrunner.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/runner.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/samplemodule.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/tester.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkunittest_la.all_cpp.P ./$(DEPDIR)/modrunner.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/runner.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/samplemodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tester.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/modrunner.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/runner.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/samplemodule.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tester.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kunittest_samplemodule_la_SOURCES) \
- $(libkunittest_la_SOURCES) $(kunittestmodrunner_SOURCES)
- DIST_SOURCES = $(kunittest_samplemodule_la_SOURCES) \
-@@ -134,6 +142,8 @@
+@@ -134,6 +134,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -58151,7 +29128,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -175,8 +185,6 @@
+@@ -175,8 +177,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -58160,7 +29137,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -253,7 +261,6 @@
+@@ -253,7 +253,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -58168,7 +29145,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -290,6 +297,9 @@
+@@ -290,6 +289,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -58178,7 +29155,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,6 +355,7 @@
+@@ -345,6 +347,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -58186,16 +29163,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -354,8 +365,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -373,6 +382,7 @@
+@@ -373,6 +376,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -58203,7 +29171,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -553,7 +563,7 @@
+@@ -553,7 +557,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58212,7 +29180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +601,9 @@
+@@ -591,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58224,189 +29192,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
-@@ -609,7 +619,7 @@
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -617,8 +627,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -682,21 +692,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -713,7 +726,7 @@
- test -z "$(libkunittestincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkunittestincludedir)"
- @list='$(libkunittestinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(libkunittestincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libkunittestincludedir)/$$f'"; \
- $(libkunittestincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libkunittestincludedir)/$$f"; \
- done
-@@ -721,7 +734,7 @@
- uninstall-libkunittestincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(libkunittestinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(libkunittestincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(libkunittestincludedir)/$$f"; \
- done
-@@ -832,7 +845,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kutils/Makefile.in
-+++ kutils/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,6 +17,8 @@
-
-
-
-+SOURCES = $(libkutils_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -56,14 +58,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libkutils_la_DEPENDENCIES = ../kio/libkio.la ksettings/libksettings.la
-@@ -85,24 +80,61 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcmodulecontainer.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleinfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleloader.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxy.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxyIfaceImpl.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmultidialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfind.Plo ./$(DEPDIR)/kfinddialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmultitabbar.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplugininfo.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreplace.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreplacedialog.Plo
-+#>+ 24
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kcmoduleproxyIface_skel.P $(DEPDIR)/libkutils_la.all_cpp.P ./$(DEPDIR)/kcmodulecontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxyIfaceImpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmultidialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfind.Plo ./$(DEPDIR)/kfinddialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultitabbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplugininfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplace.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplacedialog.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kcmoduleproxyIface_skel.P ./$(DEPDIR)/kcmodulecontainer.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleinfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleloader.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxy.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxyIfaceImpl.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmultidialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfind.Plo ./$(DEPDIR)/kfinddialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultitabbar.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplugininfo.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplace.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplacedialog.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkutils_la_SOURCES)
- DIST_SOURCES = $(libkutils_la_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -140,6 +172,8 @@
+--- kutils/ksettings/Makefile.in
++++ kutils/ksettings/Makefile.in
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -58415,7 +29203,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -181,8 +215,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -58424,7 +29212,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -259,7 +291,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -58432,7 +29220,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -296,6 +327,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -58442,7 +29230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -351,6 +385,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -58450,16 +29238,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,8 +395,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -379,6 +412,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -58467,16 +29246,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -574,7 +608,7 @@
+@@ -521,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,16 +646,16 @@
+@@ -559,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58486,307 +29265,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -629,8 +663,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -673,21 +707,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -704,7 +741,7 @@
- test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -712,7 +749,7 @@
- uninstall-kde_servicetypesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
- rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
- done
-@@ -721,7 +758,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -729,7 +766,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -741,13 +778,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -759,7 +790,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -767,13 +798,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -794,7 +819,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -894,17 +919,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -936,7 +959,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -1135,18 +1158,18 @@
-
-
- #>+ 3
--kcmultidialog.moc: $(srcdir)/kcmultidialog.h
-- $(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
-+kcmoduleproxyIfaceImpl.moc: $(srcdir)/kcmoduleproxyIfaceImpl.h
-+ $(MOC) $(srcdir)/kcmoduleproxyIfaceImpl.h -o kcmoduleproxyIfaceImpl.moc
-
- #>+ 2
--mocs: kcmultidialog.moc
-+mocs: kcmoduleproxyIfaceImpl.moc
-
- #>+ 3
--kcmoduleproxyIfaceImpl.moc: $(srcdir)/kcmoduleproxyIfaceImpl.h
-- $(MOC) $(srcdir)/kcmoduleproxyIfaceImpl.h -o kcmoduleproxyIfaceImpl.moc
-+kcmultidialog.moc: $(srcdir)/kcmultidialog.h
-+ $(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
-
- #>+ 2
--mocs: kcmoduleproxyIfaceImpl.moc
-+mocs: kcmultidialog.moc
-
- #>+ 3
- kpluginselector.moc: $(srcdir)/kpluginselector.h
-@@ -1205,22 +1228,22 @@
- mocs: kpluginselector_p.moc
-
- #>+ 3
--kfind.moc: $(srcdir)/kfind.h
-- $(MOC) $(srcdir)/kfind.h -o kfind.moc
-+kcmoduleproxy.moc: $(srcdir)/kcmoduleproxy.h
-+ $(MOC) $(srcdir)/kcmoduleproxy.h -o kcmoduleproxy.moc
-
- #>+ 2
--mocs: kfind.moc
-+mocs: kcmoduleproxy.moc
-
- #>+ 3
--kcmoduleproxy.moc: $(srcdir)/kcmoduleproxy.h
-- $(MOC) $(srcdir)/kcmoduleproxy.h -o kcmoduleproxy.moc
-+kfind.moc: $(srcdir)/kfind.h
-+ $(MOC) $(srcdir)/kfind.h -o kfind.moc
-
- #>+ 2
--mocs: kcmoduleproxy.moc
-+mocs: kfind.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f kcmultidialog.moc kcmoduleproxyIfaceImpl.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kpluginselector_p.moc kfind.moc kcmoduleproxy.moc
-+ -rm -f kcmoduleproxyIfaceImpl.moc kcmultidialog.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kpluginselector_p.moc kcmoduleproxy.moc kfind.moc
-
- #>+ 2
- KDE_DIST=kdeglobals.kcfgc Makefile.in kdeglobals.kcfg kplugininfo.desktop Makefile.am
-@@ -1276,7 +1299,7 @@
-
-
- #>+ 11
--libkutils_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfind.cpp $(srcdir)/kfinddialog.cpp $(srcdir)/kreplace.cpp $(srcdir)/kreplacedialog.cpp $(srcdir)/kcmoduleinfo.cpp $(srcdir)/kcmoduleloader.cpp $(srcdir)/kcmultidialog.cpp $(srcdir)/kmultitabbar.cpp $(srcdir)/kplugininfo.cpp $(srcdir)/kcmoduleproxy.cpp $(srcdir)/kpluginselector.cpp $(srcdir)/kcmodulecontainer.cpp $(srcdir)/kcmoduleproxyIfaceImpl.cpp kcmoduleproxyIface_skel.cpp kcmoduleproxyIfaceImpl.moc kcmultidialog.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kcmoduleproxy.moc kfind.moc kpluginselector_p.moc
-+libkutils_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfind.cpp $(srcdir)/kfinddialog.cpp $(srcdir)/kreplace.cpp $(srcdir)/kreplacedialog.cpp $(srcdir)/kcmoduleinfo.cpp $(srcdir)/kcmoduleloader.cpp $(srcdir)/kcmultidialog.cpp $(srcdir)/kmultitabbar.cpp $(srcdir)/kplugininfo.cpp $(srcdir)/kcmoduleproxy.cpp $(srcdir)/kpluginselector.cpp $(srcdir)/kcmodulecontainer.cpp $(srcdir)/kcmoduleproxyIfaceImpl.cpp kcmoduleproxyIface_skel.cpp kcmultidialog.moc kcmoduleproxyIfaceImpl.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kfind.moc kcmoduleproxy.moc kpluginselector_p.moc
- @echo 'creating libkutils_la.all_cpp.cpp ...'; \
- rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
---- kutils/ksettings/Makefile.in
-+++ kutils/ksettings/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libksettings_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -68,32 +70,36 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/componentsdialog.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/dispatcher.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/pluginpage.Plo
-+#>+ 6
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libksettings_la.all_cpp.P ./$(DEPDIR)/componentsdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/dispatcher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginpage.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/componentsdialog.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/dispatcher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginpage.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksettings_la_SOURCES)
- DIST_SOURCES = $(libksettings_la_SOURCES)
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(ksettingsincludedir)"
- ksettingsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(ksettingsinclude_HEADERS)
-@@ -114,6 +120,8 @@
+ clean-noinstLTLIBRARIES:
+--- kutils/Makefile.in
++++ kutils/Makefile.in
+@@ -140,6 +140,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -58795,7 +29278,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +163,6 @@
+@@ -181,8 +183,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -58804,7 +29287,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +239,6 @@
+@@ -259,7 +259,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -58812,7 +29295,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +275,9 @@
+@@ -296,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -58822,7 +29305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +333,7 @@
+@@ -351,6 +353,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -58830,16 +29313,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +343,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +360,7 @@
+@@ -379,6 +382,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -58847,16 +29321,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -521,7 +529,7 @@
+@@ -574,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(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*) \
-@@ -559,9 +567,9 @@
+@@ -612,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58866,123 +29340,75 @@
-$(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)
+@@ -1135,18 +1139,18 @@
- clean-noinstLTLIBRARIES:
-@@ -590,21 +598,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ #>+ 3
+-kcmultidialog.moc: $(srcdir)/kcmultidialog.h
+- $(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
++kcmoduleproxyIfaceImpl.moc: $(srcdir)/kcmoduleproxyIfaceImpl.h
++ $(MOC) $(srcdir)/kcmoduleproxyIfaceImpl.h -o kcmoduleproxyIfaceImpl.moc
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ #>+ 2
+-mocs: kcmultidialog.moc
++mocs: kcmoduleproxyIfaceImpl.moc
- mostlyclean-libtool:
-@@ -621,7 +632,7 @@
- test -z "$(ksettingsincludedir)" || $(mkdir_p) "$(DESTDIR)$(ksettingsincludedir)"
- @list='$(ksettingsinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(ksettingsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ksettingsincludedir)/$$f'"; \
- $(ksettingsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ksettingsincludedir)/$$f"; \
- done
-@@ -629,7 +640,7 @@
- uninstall-ksettingsincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(ksettingsinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(ksettingsincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(ksettingsincludedir)/$$f"; \
- done
-@@ -735,7 +746,7 @@
- clean-generic:
+ #>+ 3
+-kcmoduleproxyIfaceImpl.moc: $(srcdir)/kcmoduleproxyIfaceImpl.h
+- $(MOC) $(srcdir)/kcmoduleproxyIfaceImpl.h -o kcmoduleproxyIfaceImpl.moc
++kcmultidialog.moc: $(srcdir)/kcmultidialog.h
++ $(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ #>+ 2
+-mocs: kcmoduleproxyIfaceImpl.moc
++mocs: kcmultidialog.moc
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kutils/tests/Makefile.in
-+++ kutils/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
+ #>+ 3
+ kpluginselector.moc: $(srcdir)/kpluginselector.h
+@@ -1205,22 +1209,22 @@
+ mocs: kpluginselector_p.moc
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
+ #>+ 3
+-kfind.moc: $(srcdir)/kfind.h
+- $(MOC) $(srcdir)/kfind.h -o kfind.moc
++kcmoduleproxy.moc: $(srcdir)/kcmoduleproxy.h
++ $(MOC) $(srcdir)/kcmoduleproxy.h -o kcmoduleproxy.moc
- @SET_MAKE@
-+SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -65,24 +67,29 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kfindtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreplacetest.Po
-+#>+ 2
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kfindtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplacetest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+-mocs: kfind.moc
++mocs: kcmoduleproxy.moc
+
#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-kcmoduleproxy.moc: $(srcdir)/kcmoduleproxy.h
+- $(MOC) $(srcdir)/kcmoduleproxy.h -o kcmoduleproxy.moc
++kfind.moc: $(srcdir)/kfind.h
++ $(MOC) $(srcdir)/kfind.h -o kfind.moc
+
#>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
- DIST_SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
- ETAGS = etags
-@@ -102,6 +109,8 @@
+-mocs: kcmoduleproxy.moc
++mocs: kfind.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kcmultidialog.moc kcmoduleproxyIfaceImpl.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kpluginselector_p.moc kfind.moc kcmoduleproxy.moc
++ -rm -f kcmoduleproxyIfaceImpl.moc kcmultidialog.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kpluginselector_p.moc kcmoduleproxy.moc kfind.moc
+
+ #>+ 2
+ KDE_DIST=kdeglobals.kcfgc Makefile.in kdeglobals.kcfg kplugininfo.desktop Makefile.am
+@@ -1276,7 +1280,7 @@
+
+
+ #>+ 11
+-libkutils_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfind.cpp $(srcdir)/kfinddialog.cpp $(srcdir)/kreplace.cpp $(srcdir)/kreplacedialog.cpp $(srcdir)/kcmoduleinfo.cpp $(srcdir)/kcmoduleloader.cpp $(srcdir)/kcmultidialog.cpp $(srcdir)/kmultitabbar.cpp $(srcdir)/kplugininfo.cpp $(srcdir)/kcmoduleproxy.cpp $(srcdir)/kpluginselector.cpp $(srcdir)/kcmodulecontainer.cpp $(srcdir)/kcmoduleproxyIfaceImpl.cpp kcmoduleproxyIface_skel.cpp kcmoduleproxyIfaceImpl.moc kcmultidialog.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kcmoduleproxy.moc kfind.moc kpluginselector_p.moc
++libkutils_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kfind.cpp $(srcdir)/kfinddialog.cpp $(srcdir)/kreplace.cpp $(srcdir)/kreplacedialog.cpp $(srcdir)/kcmoduleinfo.cpp $(srcdir)/kcmoduleloader.cpp $(srcdir)/kcmultidialog.cpp $(srcdir)/kmultitabbar.cpp $(srcdir)/kplugininfo.cpp $(srcdir)/kcmoduleproxy.cpp $(srcdir)/kpluginselector.cpp $(srcdir)/kcmodulecontainer.cpp $(srcdir)/kcmoduleproxyIfaceImpl.cpp kcmoduleproxyIface_skel.cpp kcmultidialog.moc kcmoduleproxyIfaceImpl.moc kpluginselector.moc kreplacedialog.moc kfinddialog.moc kreplace.moc kcmodulecontainer.moc kmultitabbar.moc kmultitabbar_p.moc kfind.moc kcmoduleproxy.moc kpluginselector_p.moc
+ @echo 'creating libkutils_la.all_cpp.cpp ...'; \
+ rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
+--- kutils/tests/Makefile.in
++++ kutils/tests/Makefile.in
+@@ -102,6 +102,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -58991,7 +29417,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -143,8 +152,6 @@
+@@ -143,8 +145,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -59000,7 +29426,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -221,7 +228,6 @@
+@@ -221,7 +221,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -59008,7 +29434,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -258,6 +264,9 @@
+@@ -258,6 +257,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -59018,7 +29444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,6 +322,7 @@
+@@ -313,6 +315,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -59026,16 +29452,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -322,8 +332,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -341,6 +349,7 @@
+@@ -341,6 +344,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -59043,7 +29460,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -512,7 +521,7 @@
+@@ -512,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59052,7 +29469,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +559,9 @@
+@@ -550,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59064,58 +29481,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -581,21 +590,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -781,7 +793,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kwallet/Makefile.in
-+++ kwallet/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,6 +85,8 @@
+--- kwallet/backend/Makefile.in
++++ kwallet/backend/Makefile.in
+@@ -116,6 +116,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -59124,7 +29492,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -126,8 +128,6 @@
+@@ -157,8 +159,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -59133,7 +29501,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -204,7 +204,6 @@
+@@ -235,7 +235,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -59141,7 +29509,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -241,6 +240,9 @@
+@@ -272,6 +271,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -59151,7 +29519,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +298,7 @@
+@@ -327,6 +329,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -59159,16 +29527,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,8 +308,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -324,6 +325,7 @@
+@@ -355,6 +358,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -59176,16 +29535,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -488,7 +490,7 @@
- all: docs-am all-recursive
+@@ -539,7 +543,7 @@
.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)
+ .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*) \
-@@ -526,9 +528,9 @@
+@@ -577,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59195,168 +29554,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -548,13 +550,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -566,7 +562,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -574,13 +570,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -601,7 +591,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -701,17 +691,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -740,7 +728,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kwallet/backend/Makefile.in
-+++ kwallet/backend/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkwalletbackend_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -78,24 +74,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/blockcipher.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/blowfish.Plo ./$(DEPDIR)/cbc.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletbackend.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletentry.Plo ./$(DEPDIR)/sha1.Plo
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkwalletbackend_la.all_cc.P ./$(DEPDIR)/blockcipher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/blowfish.Plo ./$(DEPDIR)/cbc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletentry.Plo ./$(DEPDIR)/sha1.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/blockcipher.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/blowfish.Plo ./$(DEPDIR)/cbc.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletbackend.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletentry.Plo ./$(DEPDIR)/sha1.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkwalletbackend_la_SOURCES)
- DIST_SOURCES = $(libkwalletbackend_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
-@@ -116,6 +125,8 @@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kwallet/backend/tests/Makefile.in
++++ kwallet/backend/tests/Makefile.in
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -59365,7 +29567,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -157,8 +168,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -59374,7 +29576,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -235,7 +244,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -59382,7 +29584,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -272,6 +280,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -59392,7 +29594,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,6 +338,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -59400,16 +29602,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -336,8 +348,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -355,6 +365,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -59417,16 +29610,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -539,7 +550,7 @@
+@@ -522,7 +526,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*) \
-@@ -577,16 +588,16 @@
+@@ -560,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59436,124 +29629,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -594,8 +605,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -631,21 +642,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -759,7 +773,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kwallet/backend/tests/Makefile.in
-+++ kwallet/backend/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) $(testsha_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -76,24 +78,29 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/backendtest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testbf.Po ./$(DEPDIR)/testsha.Po
-+#>+ 2
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backendtest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testbf.Po ./$(DEPDIR)/testsha.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) $(testsha_SOURCES)
- DIST_SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) \
- $(testsha_SOURCES)
-@@ -114,6 +121,8 @@
+ clean-checkPROGRAMS:
+--- kwallet/client/Makefile.in
++++ kwallet/client/Makefile.in
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -59562,7 +29642,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +164,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -59571,7 +29651,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +240,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -59579,7 +29659,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +276,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -59589,7 +29669,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +334,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -59597,16 +29677,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +344,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +361,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -59614,16 +29685,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -522,7 +531,7 @@
+@@ -529,7 +533,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*) \
-@@ -560,9 +569,9 @@
+@@ -567,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59633,117 +29704,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-checkPROGRAMS:
-@@ -595,21 +604,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -721,7 +733,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- kwallet/client/Makefile.in
-+++ kwallet/client/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkwalletclient_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -75,24 +71,28 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kwallet.Plo
-+#>+ 2
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kwallet_skel.P $(DEPDIR)/libkwalletclient_la.all_cc.P ./$(DEPDIR)/kwallet.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kwallet_skel.P ./$(DEPDIR)/kwallet.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkwalletclient_la_SOURCES)
- DIST_SOURCES = $(libkwalletclient_la_SOURCES)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -114,6 +114,8 @@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kwallet/Makefile.in
++++ kwallet/Makefile.in
+@@ -85,6 +85,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -59752,7 +29717,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +157,6 @@
+@@ -126,8 +128,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -59761,7 +29726,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +233,6 @@
+@@ -204,7 +204,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -59769,7 +29734,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +269,9 @@
+@@ -241,6 +240,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -59779,7 +29744,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +327,7 @@
+@@ -296,6 +298,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -59787,16 +29752,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +337,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +354,7 @@
+@@ -324,6 +327,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -59804,16 +29760,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -529,7 +531,7 @@
+@@ -488,7 +492,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)
+-$(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*) \
-@@ -567,16 +569,16 @@
+@@ -526,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59823,150 +29779,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -584,8 +586,8 @@
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -616,21 +618,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -647,7 +652,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -655,7 +660,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -761,7 +766,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- kwallet/tests/Makefile.in
+++ kwallet/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,6 +14,8 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) $(kwalletsync_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -79,24 +81,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kwalletasync.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletboth.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletsync.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwallettest.Po
-+#>+ 8
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kwalletasync.all_cpp.P $(DEPDIR)/kwalletboth.all_cpp.P ./$(DEPDIR)/kwalletasync.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletboth.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletsync.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwallettest.Po
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kwalletasync.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletboth.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletsync.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwallettest.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) \
- $(kwalletsync_SOURCES)
- DIST_SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) \
-@@ -118,6 +133,8 @@
+@@ -118,6 +118,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -59975,7 +29792,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -159,8 +176,6 @@
+@@ -159,8 +161,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -59984,7 +29801,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -237,7 +252,6 @@
+@@ -237,7 +237,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -59992,7 +29809,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -274,6 +288,9 @@
+@@ -274,6 +273,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -60002,7 +29819,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,6 +346,7 @@
+@@ -329,6 +331,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -60010,16 +29827,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,8 +356,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -357,6 +373,7 @@
+@@ -357,6 +360,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -60027,7 +29835,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -530,7 +547,7 @@
+@@ -530,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60036,7 +29844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +585,9 @@
+@@ -568,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60048,142 +29856,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -604,21 +621,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -730,7 +750,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- libkmid/Makefile.in
+++ libkmid/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkmid_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,14 +56,7 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" \
-- "$(DESTDIR)$(libkmidincludedir)"
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmidincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -83,24 +78,52 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/alsaout.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dattypes.Plo ./$(DEPDIR)/deviceman.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/fmout.Plo ./$(DEPDIR)/gusout.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkmid.Plo ./$(DEPDIR)/midfile.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/midimapper.Plo ./$(DEPDIR)/midiout.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/midistat.Plo ./$(DEPDIR)/mt32togm.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/notearray.Plo ./$(DEPDIR)/player.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/synthout.Plo ./$(DEPDIR)/track.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/voiceman.Plo
-+#>+ 18
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkmid_la.all_cc.P ./$(DEPDIR)/alsaout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dattypes.Plo ./$(DEPDIR)/deviceman.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fmout.Plo ./$(DEPDIR)/gusout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkmid.Plo ./$(DEPDIR)/midfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/midimapper.Plo ./$(DEPDIR)/midiout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/midistat.Plo ./$(DEPDIR)/mt32togm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notearray.Plo ./$(DEPDIR)/player.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/synthout.Plo ./$(DEPDIR)/track.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/voiceman.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/alsaout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dattypes.Plo ./$(DEPDIR)/deviceman.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fmout.Plo ./$(DEPDIR)/gusout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkmid.Plo ./$(DEPDIR)/midfile.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/midimapper.Plo ./$(DEPDIR)/midiout.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/midistat.Plo ./$(DEPDIR)/mt32togm.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/notearray.Plo ./$(DEPDIR)/player.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/synthout.Plo ./$(DEPDIR)/track.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/voiceman.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmid_la_SOURCES)
- DIST_SOURCES = $(libkmid_la_SOURCES)
- libkmidincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -122,6 +145,8 @@
+@@ -122,6 +122,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -60192,7 +29867,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -163,8 +188,6 @@
+@@ -163,8 +165,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -60201,7 +29876,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -241,7 +264,6 @@
+@@ -241,7 +241,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -60209,7 +29884,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -278,6 +300,9 @@
+@@ -278,6 +277,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -60219,7 +29894,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -333,6 +358,7 @@
+@@ -333,6 +335,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -60227,16 +29902,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -342,8 +368,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -361,6 +385,7 @@
+@@ -361,6 +364,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -60244,7 +29910,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -545,7 +570,7 @@
+@@ -545,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -60253,7 +29919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,16 +608,16 @@
+@@ -583,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60265,150 +29931,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -600,8 +625,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -647,21 +672,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -678,7 +706,7 @@
- test -z "$(libkmidincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmidincludedir)"
- @list='$(libkmidinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(libkmidincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libkmidincludedir)/$$f'"; \
- $(libkmidincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libkmidincludedir)/$$f"; \
- done
-@@ -686,7 +714,7 @@
- uninstall-libkmidincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(libkmidinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(libkmidincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(libkmidincludedir)/$$f"; \
- done
-@@ -793,7 +821,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- libkmid/tests/Makefile.in
+++ libkmid/tests/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -72,32 +74,37 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/apitest.Po ./$(DEPDIR)/ctest.Po \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/notesoff.Po
-+#>+ 2
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apitest.Po ./$(DEPDIR)/ctest.Po \
-+ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notesoff.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
- DIST_SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
- ETAGS = etags
-@@ -117,6 +124,8 @@
+@@ -117,6 +117,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -60417,7 +29942,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -158,8 +167,6 @@
+@@ -158,8 +160,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -60426,7 +29951,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -236,7 +243,6 @@
+@@ -236,7 +236,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -60434,7 +29959,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -273,6 +279,9 @@
+@@ -273,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -60444,7 +29969,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -328,6 +337,7 @@
+@@ -328,6 +330,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -60452,16 +29977,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -337,8 +347,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -356,6 +364,7 @@
+@@ -356,6 +359,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -60469,7 +29985,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +534,7 @@
+@@ -525,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -60478,7 +29994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +572,9 @@
+@@ -563,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60490,145 +30006,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-@@ -598,42 +607,48 @@
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
- @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cc.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cc.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cc.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -744,7 +759,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- libkscreensaver/Makefile.in
+++ libkscreensaver/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libkscreensaver_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -54,12 +56,6 @@
- $(top_builddir)/kio/kssl/ksslconfig.h \
- $(top_builddir)/kjs/global.h
- CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -75,24 +71,31 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kscreensaver.Plo \
-+#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
-+#>+ 4
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkscreensaver_la.all_cpp.P ./$(DEPDIR)/kscreensaver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kscreensaver.Plo \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkscreensaver_la_SOURCES)
- DIST_SOURCES = $(libkscreensaver_la_SOURCES)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -114,6 +117,8 @@
+@@ -114,6 +114,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -60637,7 +30017,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -155,8 +160,6 @@
+@@ -155,8 +157,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -60646,7 +30026,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -233,7 +236,6 @@
+@@ -233,7 +233,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -60654,7 +30034,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -270,6 +272,9 @@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -60664,7 +30044,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,6 +330,7 @@
+@@ -325,6 +327,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -60672,16 +30052,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,8 +340,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -60689,7 +30060,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -523,7 +528,7 @@
+@@ -523,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60698,7 +30069,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,16 +566,16 @@
+@@ -561,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60710,118 +30081,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
-@@ -578,8 +583,8 @@
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-@@ -608,21 +613,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
-@@ -639,7 +647,7 @@
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -647,7 +655,7 @@
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-@@ -754,7 +762,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- libltdl/Makefile.in
+++ libltdl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +16,8 @@
- @SET_MAKE@
-
-
-+SOURCES = $(libltdlc_la_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -66,11 +68,11 @@
- am__depfiles_maybe =
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libltdlc_la_SOURCES)
- DIST_SOURCES = $(libltdlc_la_SOURCES)
-@@ -92,6 +94,8 @@
+@@ -92,6 +92,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -60830,7 +30092,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -133,8 +137,6 @@
+@@ -133,8 +135,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -60839,7 +30101,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -211,7 +213,6 @@
+@@ -211,7 +211,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -60847,7 +30109,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -248,6 +249,9 @@
+@@ -248,6 +247,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -60857,7 +30119,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -303,6 +307,7 @@
+@@ -303,6 +305,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -60865,15 +30127,6 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -312,8 +317,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
@@ -331,6 +334,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
@@ -60903,43 +30156,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -675,7 +679,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- licenses/Makefile.in
+++ licenses/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(licensesdatadir)"
- licensesdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(licensesdata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -60948,7 +30167,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -60957,7 +30176,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -60965,7 +30184,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -60975,7 +30194,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -60983,16 +30202,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61000,7 +30210,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -480,7 +476,7 @@
+@@ -480,7 +484,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61009,7 +30219,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +514,9 @@
+@@ -518,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61021,61 +30231,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -537,7 +533,7 @@
- test -z "$(licensesdatadir)" || $(mkdir_p) "$(DESTDIR)$(licensesdatadir)"
- @list='$(licensesdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(licensesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(licensesdatadir)/$$f'"; \
- $(licensesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(licensesdatadir)/$$f"; \
- done
-@@ -545,7 +541,7 @@
- uninstall-licensesdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(licensesdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(licensesdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(licensesdatadir)/$$f"; \
- done
-@@ -609,7 +605,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- mimetypes/Makefile.in
-+++ mimetypes/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,12 +67,6 @@
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive nmcheck-recursive bcheck-recursive
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypesdatadir)"
- mimetypesdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypesdata_DATA)
-@@ -94,6 +88,8 @@
+--- Makefile.in
++++ Makefile.in
+@@ -130,6 +130,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -61084,7 +30242,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -135,8 +131,6 @@
+@@ -171,8 +173,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -61093,7 +30251,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -213,7 +207,6 @@
+@@ -249,7 +249,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -61101,7 +30259,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -250,6 +243,9 @@
+@@ -286,6 +285,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -61111,7 +30269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -305,6 +301,7 @@
+@@ -341,6 +343,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -61119,16 +30277,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -314,8 +311,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -333,6 +328,7 @@
+@@ -369,6 +372,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61136,152 +30285,51 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -497,7 +493,7 @@
- all: docs-am all-recursive
-
+@@ -544,7 +548,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/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +531,9 @@
+@@ -586,12 +590,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:
-@@ -554,7 +550,7 @@
- test -z "$(mimetypesdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypesdatadir)"
- @list='$(mimetypesdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypesdatadir)/$$f'"; \
- $(mimetypesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypesdatadir)/$$f"; \
- done
-@@ -562,7 +558,7 @@
- uninstall-mimetypesdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypesdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypesdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypesdatadir)/$$f"; \
- done
-@@ -574,13 +570,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -592,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -600,13 +590,7 @@
+ config.h: stamp-h1
+@@ -603,7 +607,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 $@
+@@ -1215,7 +1219,7 @@
+ .NOEXPORT:
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -627,7 +611,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -726,17 +710,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -768,7 +750,7 @@
- clean-generic:
+ #>+ 2
+-KDE_DIST=Mainpage.dox configure.files Makefile.am.in.wo aclocal.m4 Makefile.am.in subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs acinclude.m4 Makefile.am
++KDE_DIST=Mainpage.dox configure.files Makefile.am.in.wo aclocal.m4 Makefile.am.in stamp-h.in subdirs Makefile.in KDE3PORTING.html config.h.in configure.in Makefile.cvs Makefile.am configure acinclude.m4
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
+ #>+ 2
+ docs-am:
--- mimetypes/application/Makefile.in
+++ mimetypes/application/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypeapplicationdatadir)"
- mimetypeapplicationdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypeapplicationdata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -61290,7 +30338,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -61299,7 +30347,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -61307,7 +30355,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -61317,7 +30365,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -61325,16 +30373,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61342,16 +30381,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -504,7 +500,7 @@
- x-kspread.desktop x-kugar.desktop x-kword.desktop \
- x-quattropro.desktop x-amipro.desktop x-tgif.desktop \
- x-lyx.desktop x-zerosize.desktop x-kpovmodeler.desktop x-cda.desktop \
-- pkcs7-mime.desktop pkcs10.desktop sieve.desktop \
-+ pkcs7-mime.desktop pkcs10.desktop sieve.desktop mbox.desktop \
- x-hancomword.desktop \
- x-font-bdf.desktop x-font-pcf.desktop x-font-speedo.desktop x-font-type1.desktop \
- x-font-ghostscript.desktop x-font-snf.desktop x-font-ttf.desktop \
-@@ -549,7 +545,7 @@
+@@ -549,7 +553,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61360,7 +30390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +583,9 @@
+@@ -587,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61372,70 +30402,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -606,7 +602,7 @@
- test -z "$(mimetypeapplicationdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeapplicationdatadir)"
- @list='$(mimetypeapplicationdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypeapplicationdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeapplicationdatadir)/$$f'"; \
- $(mimetypeapplicationdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeapplicationdatadir)/$$f"; \
- done
-@@ -614,7 +610,7 @@
- uninstall-mimetypeapplicationdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypeapplicationdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypeapplicationdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypeapplicationdatadir)/$$f"; \
- done
-@@ -678,7 +674,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -756,7 +752,7 @@
+@@ -756,7 +760,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop
+-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop
+KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-java.desktop x-mswrite.desktop x-afm.desktop x-executable-script.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop x-designer.desktop pkcs10.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-bittorrent.desktop x-cda.desktop xml.desktop x-jar.desktop x-magicpoint.desktop octet-stream.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop xhtml+xml.desktop x-shellscript.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop
#>+ 2
docs-am:
--- mimetypes/audio/Makefile.in
+++ mimetypes/audio/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypeaudiodatadir)"
- mimetypeaudiodataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypeaudiodata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -61444,7 +30422,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -61453,7 +30431,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -61461,7 +30439,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -61471,7 +30449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -61479,16 +30457,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61496,7 +30465,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -490,7 +486,7 @@
+@@ -490,7 +494,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61505,7 +30474,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +524,9 @@
+@@ -528,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61517,34 +30486,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -547,7 +543,7 @@
- test -z "$(mimetypeaudiodatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeaudiodatadir)"
- @list='$(mimetypeaudiodata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypeaudiodataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeaudiodatadir)/$$f'"; \
- $(mimetypeaudiodataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeaudiodatadir)/$$f"; \
- done
-@@ -555,7 +551,7 @@
- uninstall-mimetypeaudiodataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypeaudiodata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypeaudiodatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypeaudiodatadir)/$$f"; \
- done
-@@ -619,7 +615,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -690,7 +686,7 @@
+@@ -690,7 +694,7 @@
.NOEXPORT:
#>+ 2
@@ -61555,32 +30497,7 @@
docs-am:
--- mimetypes/image/Makefile.in
+++ mimetypes/image/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypeimagedatadir)"
- mimetypeimagedataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypeimagedata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -61589,7 +30506,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -61598,7 +30515,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -61606,7 +30523,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -61616,7 +30533,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -61624,16 +30541,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61641,17 +30549,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -481,7 +477,8 @@
- x-portable-pixmap.desktop x-pcx.desktop x-targa.desktop jp2.desktop \
- x-vnd.trolltech.qpicture.desktop x-vnd.adobe.photoshop.desktop \
- x-xcursor.desktop pjpeg.desktop x-exr.desktop \
-- x-rgb.desktop x-dds.desktop x-djvu.desktop x-hdr.desktop fits.desktop
-+ x-rgb.desktop x-dds.desktop x-djvu.desktop x-djvu-2.desktop x-hdr.desktop \
-+ fits.desktop
-
- mimetypeimagedatadir = $(kde_mimedir)/image
- EXTRA_DIST = $(mimetypeimagedata_DATA)
-@@ -490,7 +487,7 @@
+@@ -491,7 +495,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61660,7 +30558,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +525,9 @@
+@@ -529,9 +533,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61672,70 +30570,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -547,7 +544,7 @@
- test -z "$(mimetypeimagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeimagedatadir)"
- @list='$(mimetypeimagedata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypeimagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeimagedatadir)/$$f'"; \
- $(mimetypeimagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeimagedatadir)/$$f"; \
- done
-@@ -555,7 +552,7 @@
- uninstall-mimetypeimagedataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypeimagedata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypeimagedatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypeimagedatadir)/$$f"; \
- done
-@@ -619,7 +616,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -694,7 +691,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=fax-g3.desktop x-ico.desktop jpg.desktop x-photo-cd.desktop x-vnd.trolltech.qpicture.desktop x-portable-pixmap.desktop tiff.desktop x-xcf-gimp.desktop x-msod.desktop Makefile.in x-djvu.desktop x-wmf.desktop x-bmp.desktop svg+xml.desktop x-xcursor.desktop uninstall.desktop x-pcx.desktop x-xpm.desktop x-hdr.desktop svg-xml.desktop x-portable-greymap.desktop png.desktop x-exr.desktop x-eps.desktop pjpeg.desktop x-rgb.desktop fits.desktop x-targa.desktop x-jng.desktop x-portable-bitmap.desktop x-xbm.desktop jpeg.desktop x-vnd.adobe.photoshop.desktop gif.desktop x-xfig.desktop x-dds.desktop cgm.desktop jp2.desktop Makefile.am
-+KDE_DIST=fax-g3.desktop x-ico.desktop jpg.desktop x-photo-cd.desktop x-vnd.trolltech.qpicture.desktop x-portable-pixmap.desktop tiff.desktop x-xcf-gimp.desktop x-msod.desktop Makefile.in x-djvu.desktop x-wmf.desktop x-bmp.desktop svg+xml.desktop x-xcursor.desktop uninstall.desktop x-pcx.desktop x-xpm.desktop x-hdr.desktop svg-xml.desktop x-portable-greymap.desktop png.desktop x-exr.desktop x-djvu-2.desktop x-eps.desktop pjpeg.desktop x-rgb.desktop fits.desktop x-targa.desktop x-jng.desktop x-portable-bitmap.desktop x-xbm.desktop jpeg.desktop x-vnd.adobe.photoshop.desktop gif.desktop x-xfig.desktop x-dds.desktop cgm.desktop jp2.desktop Makefile.am
-
- #>+ 2
- docs-am:
--- mimetypes/inode/Makefile.in
+++ mimetypes/inode/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypeinodedatadir)"
- mimetypeinodedataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypeinodedata_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -61744,7 +30581,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -61753,7 +30590,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -61761,7 +30598,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -61771,7 +30608,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -61779,16 +30616,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61796,7 +30624,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -483,7 +479,7 @@
+@@ -483,7 +487,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61805,7 +30633,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +517,9 @@
+@@ -521,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61817,61 +30645,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -540,7 +536,7 @@
- test -z "$(mimetypeinodedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeinodedatadir)"
- @list='$(mimetypeinodedata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypeinodedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeinodedatadir)/$$f'"; \
- $(mimetypeinodedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeinodedatadir)/$$f"; \
- done
-@@ -548,7 +544,7 @@
- uninstall-mimetypeinodedataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypeinodedata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypeinodedatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypeinodedatadir)/$$f"; \
- done
-@@ -612,7 +608,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- mimetypes/message/Makefile.in
-+++ mimetypes/message/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypemessagedatadir)"
- mimetypemessagedataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypemessagedata_DATA)
-@@ -78,6 +72,8 @@
+--- mimetypes/Makefile.in
++++ mimetypes/Makefile.in
+@@ -94,6 +94,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -61880,7 +30656,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -135,8 +137,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -61889,7 +30665,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -213,7 +213,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -61897,7 +30673,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -250,6 +249,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -61907,7 +30683,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -305,6 +307,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -61915,16 +30691,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -333,6 +336,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -61932,8 +30699,8 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -481,7 +477,7 @@
- all: docs-am all-am
+@@ -497,7 +501,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -61941,7 +30708,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +515,9 @@
+@@ -535,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61953,61 +30720,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,7 +534,7 @@
- test -z "$(mimetypemessagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemessagedatadir)"
- @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypemessagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
- $(mimetypemessagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
- done
-@@ -546,7 +542,7 @@
- uninstall-mimetypemessagedataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
- done
-@@ -610,7 +606,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- mimetypes/model/Makefile.in
-+++ mimetypes/model/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypemessagedatadir)"
- mimetypemessagedataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypemessagedata_DATA)
-@@ -78,6 +72,8 @@
+--- mimetypes/message/Makefile.in
++++ mimetypes/message/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62016,7 +30731,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62025,7 +30740,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62033,7 +30748,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62043,7 +30758,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62051,16 +30766,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -62068,7 +30774,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -481,7 +477,7 @@
+@@ -481,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -62077,7 +30783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +515,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62089,61 +30795,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,7 +534,7 @@
- test -z "$(mimetypemessagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemessagedatadir)"
- @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypemessagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
- $(mimetypemessagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
- done
-@@ -546,7 +542,7 @@
- uninstall-mimetypemessagedataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
- done
-@@ -610,7 +606,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- mimetypes/multipart/Makefile.in
-+++ mimetypes/multipart/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypemultipartdatadir)"
- mimetypemultipartdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypemultipartdata_DATA)
-@@ -78,6 +72,8 @@
+--- mimetypes/model/Makefile.in
++++ mimetypes/model/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62152,7 +30806,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62161,7 +30815,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62169,7 +30823,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62179,7 +30833,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62187,16 +30841,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -62204,7 +30849,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -481,7 +477,7 @@
+@@ -481,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -62213,7 +30858,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +515,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62225,61 +30870,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,7 +534,7 @@
- test -z "$(mimetypemultipartdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemultipartdatadir)"
- @list='$(mimetypemultipartdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypemultipartdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypemultipartdatadir)/$$f'"; \
- $(mimetypemultipartdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypemultipartdatadir)/$$f"; \
- done
-@@ -546,7 +542,7 @@
- uninstall-mimetypemultipartdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypemultipartdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypemultipartdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypemultipartdatadir)/$$f"; \
- done
-@@ -610,7 +606,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- mimetypes/text/Makefile.in
-+++ mimetypes/text/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypetextdatadir)"
- mimetypetextdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypetextdata_DATA)
-@@ -78,6 +72,8 @@
+--- mimetypes/multipart/Makefile.in
++++ mimetypes/multipart/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62288,7 +30881,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62297,7 +30890,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62305,7 +30898,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62315,7 +30908,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62323,16 +30916,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -62340,7 +30924,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -489,7 +485,7 @@
+@@ -481,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -62349,7 +30933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +523,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62361,70 +30945,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -546,7 +542,7 @@
- test -z "$(mimetypetextdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypetextdatadir)"
- @list='$(mimetypetextdata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypetextdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypetextdatadir)/$$f'"; \
- $(mimetypetextdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypetextdatadir)/$$f"; \
- done
-@@ -554,7 +550,7 @@
- uninstall-mimetypetextdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypetextdata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypetextdatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypetextdatadir)/$$f"; \
- done
-@@ -618,7 +614,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -695,7 +691,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=plain.desktop enriched.desktop x-c++hdr.desktop rtf.desktop x-vcard.desktop x-katefilelist.desktop x-mswinurl.desktop rdf.desktop x-adasrc.desktop x-hex.desktop Makefile.in x-vcalendar.desktop uninstall.desktop x-csrc.desktop x-java.desktop vnd.wap.wml.desktop css.desktop vnd.abc.desktop x-ldif.desktop sgml.desktop x-log.desktop rss.desktop html.desktop x-bibtex.desktop x-xslt.desktop calendar.desktop x-tex.desktop x-chdr.desktop x-csv.desktop x-objchdr.desktop x-c++src.desktop x-pascal.desktop xml.desktop docbook.desktop javascript.desktop x-latex.desktop x-moc.desktop x-tcl.desktop x-objcsrc.desktop x-xslfo.desktop x-diff.desktop Makefile.am x-makefile.desktop
-+KDE_DIST=plain.desktop enriched.desktop x-c++hdr.desktop rtf.desktop x-vcard.desktop x-katefilelist.desktop x-mswinurl.desktop rdf.desktop x-adasrc.desktop x-hex.desktop Makefile.in uninstall.desktop x-vcalendar.desktop x-csrc.desktop x-java.desktop vnd.wap.wml.desktop css.desktop vnd.abc.desktop x-ldif.desktop sgml.desktop x-log.desktop rss.desktop html.desktop x-bibtex.desktop x-xslt.desktop calendar.desktop x-tex.desktop x-chdr.desktop x-csv.desktop x-objchdr.desktop x-c++src.desktop x-pascal.desktop xml.desktop docbook.desktop javascript.desktop x-latex.desktop x-moc.desktop x-tcl.desktop x-objcsrc.desktop x-xslfo.desktop x-diff.desktop Makefile.am x-makefile.desktop
-
- #>+ 2
- docs-am:
---- mimetypes/uri/Makefile.in
-+++ mimetypes/uri/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypeuridatadir)"
- mimetypeuridataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypeuridata_DATA)
-@@ -78,6 +72,8 @@
+--- mimetypes/text/Makefile.in
++++ mimetypes/text/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62433,7 +30956,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62442,7 +30965,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62450,7 +30973,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62460,7 +30983,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62468,16 +30991,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -62485,7 +30999,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -481,7 +477,7 @@
+@@ -489,7 +493,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -62494,7 +31008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +515,9 @@
+@@ -527,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62506,61 +31020,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,7 +534,7 @@
- test -z "$(mimetypeuridatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeuridatadir)"
- @list='$(mimetypeuridata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypeuridataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeuridatadir)/$$f'"; \
- $(mimetypeuridataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeuridatadir)/$$f"; \
- done
-@@ -546,7 +542,7 @@
- uninstall-mimetypeuridataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypeuridata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypeuridatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypeuridatadir)/$$f"; \
- done
-@@ -610,7 +606,7 @@
- clean-generic:
+@@ -695,7 +699,7 @@
+ .NOEXPORT:
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ #>+ 2
+-KDE_DIST=plain.desktop enriched.desktop x-c++hdr.desktop rtf.desktop x-vcard.desktop x-katefilelist.desktop x-mswinurl.desktop rdf.desktop x-adasrc.desktop x-hex.desktop Makefile.in x-vcalendar.desktop uninstall.desktop x-csrc.desktop x-java.desktop vnd.wap.wml.desktop css.desktop vnd.abc.desktop x-ldif.desktop sgml.desktop x-log.desktop rss.desktop html.desktop x-bibtex.desktop x-xslt.desktop calendar.desktop x-tex.desktop x-chdr.desktop x-csv.desktop x-objchdr.desktop x-c++src.desktop x-pascal.desktop xml.desktop docbook.desktop javascript.desktop x-latex.desktop x-moc.desktop x-tcl.desktop x-objcsrc.desktop x-xslfo.desktop x-diff.desktop Makefile.am x-makefile.desktop
++KDE_DIST=plain.desktop enriched.desktop x-c++hdr.desktop rtf.desktop x-vcard.desktop x-katefilelist.desktop x-mswinurl.desktop rdf.desktop x-adasrc.desktop x-hex.desktop Makefile.in uninstall.desktop x-vcalendar.desktop x-csrc.desktop x-java.desktop vnd.wap.wml.desktop css.desktop vnd.abc.desktop x-ldif.desktop sgml.desktop x-log.desktop rss.desktop html.desktop x-bibtex.desktop x-xslt.desktop calendar.desktop x-tex.desktop x-chdr.desktop x-csv.desktop x-objchdr.desktop x-c++src.desktop x-pascal.desktop xml.desktop docbook.desktop javascript.desktop x-latex.desktop x-moc.desktop x-tcl.desktop x-objcsrc.desktop x-xslfo.desktop x-diff.desktop Makefile.am x-makefile.desktop
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- mimetypes/video/Makefile.in
-+++ mimetypes/video/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(mimetypevideodatadir)"
- mimetypevideodataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(mimetypevideodata_DATA)
-@@ -78,6 +72,8 @@
+ #>+ 2
+ docs-am:
+--- mimetypes/uri/Makefile.in
++++ mimetypes/uri/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62569,7 +31040,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62578,7 +31049,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62586,7 +31057,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62596,7 +31067,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62604,16 +31075,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -62621,7 +31083,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -485,7 +481,7 @@
+@@ -481,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -62630,7 +31092,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +519,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62642,91 +31104,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -542,7 +538,7 @@
- test -z "$(mimetypevideodatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypevideodatadir)"
- @list='$(mimetypevideodata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(mimetypevideodataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypevideodatadir)/$$f'"; \
- $(mimetypevideodataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypevideodatadir)/$$f"; \
- done
-@@ -550,7 +546,7 @@
- uninstall-mimetypevideodataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(mimetypevideodata_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(mimetypevideodatadir)/$$f'"; \
- rm -f "$(DESTDIR)$(mimetypevideodatadir)/$$f"; \
- done
-@@ -614,7 +610,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
---- pics/Makefile.in
-+++ pics/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+SOURCES = $(ksvgtopng_SOURCES)
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -67,24 +69,27 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ksvgtopng.Po
-+#>+ 1
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ksvgtopng.Po
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksvgtopng_SOURCES)
- DIST_SOURCES = $(ksvgtopng_SOURCES)
- #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -118,6 +123,8 @@
+--- mimetypes/video/Makefile.in
++++ mimetypes/video/Makefile.in
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62735,7 +31115,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -159,8 +166,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62744,7 +31124,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -237,7 +242,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62752,7 +31132,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -274,6 +278,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62762,7 +31142,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -329,6 +336,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62770,16 +31150,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,8 +346,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -357,6 +363,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -62787,16 +31158,16 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -525,7 +532,7 @@
+@@ -485,7 +489,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*) \
-@@ -563,9 +570,9 @@
+@@ -523,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62806,152 +31177,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -611,21 +618,24 @@
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
- .cpp.obj:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
- @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-@@ -645,13 +655,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -663,7 +667,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -671,13 +675,7 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @failcom='exit 1'; \
-- for f in x $$MAKEFLAGS; do \
-- case $$f in \
-- *=* | --[!k]*);; \
-- *k*) failcom='fail=yes';; \
-- esac; \
-- done; \
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -698,7 +696,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || eval $$failcom; \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -797,17 +795,15 @@
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || mkdir "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="../$(top_distdir)" \
-+ distdir="../$(distdir)/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -839,7 +835,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -925,7 +921,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in LICENSE.crystalsvg Makefile.am
-+KDE_DIST=LICENSE.crystalsvg Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
--- pics/crystalsvg/Makefile.in
+++ pics/crystalsvg/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(crystaldir)"
- crystalDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(crystal_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -62960,7 +31190,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -62969,7 +31199,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -62977,7 +31207,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -62987,7 +31217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -62995,16 +31225,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -63012,7 +31233,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -481,7 +477,7 @@
+@@ -481,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -63021,7 +31242,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +515,9 @@
+@@ -519,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63033,44 +31254,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,7 +534,7 @@
- test -z "$(crystaldir)" || $(mkdir_p) "$(DESTDIR)$(crystaldir)"
- @list='$(crystal_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(crystalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(crystaldir)/$$f'"; \
- $(crystalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(crystaldir)/$$f"; \
- done
-@@ -546,7 +542,7 @@
- uninstall-crystalDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(crystal_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(crystaldir)/$$f'"; \
- rm -f "$(DESTDIR)$(crystaldir)/$$f"; \
- done
-@@ -610,7 +606,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -702,3886 +698,3886 @@
+@@ -702,3890 +706,3890 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png cr16-action-about_kde.png crsc-mime-zip.svgz cr32-action-mail_post_to.png cr48-action-rotate_ccw.png cr16-mime-tar.png cr16-device-hdd_mount.png cr64-mime-exec_wine.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr32-mime-exec_wine.png cr22-action-player_eject.png cr22-mime-tgz.png cr32-action-messagebox_critical.png crsc-device-zip_unmount.svgz cr32-action-text_block.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png crsc-action-eraser.svgz cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr48-device-ipod_unmount.png cr16-action-2rightarrow.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr64-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr64-device-smart_media_mount.png cr48-mime-source_o.png cr32-device-cdwriter_unmount.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-action-frameprint.png cr48-mime-encrypted.png cr32-mime-make.png crsc-mime-source.svgz cr128-filesys-folder_yellow.png cr22-action-thumbnail.png cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr32-filesys-desktop.png cr16-mime-postscript.png cr16-action-text.png cr32-mime-pdf.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr64-mime-gf.png cr16-action-save_all.png cr48-mime-txt.png cr128-mime-metafont.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr128-mime-source.png cr48-filesys-folder_violet.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png cr32-action-bookmark_folder.png crsc-action-back.svgz cr22-mime-info.png cr22-action-mail_new3.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr48-action-reload_page.png cr128-mime-source_f.png cr16-mime-misc.png cr16-action-player_play.png cr128-filesys-link_overlay.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png crsc-action-bottom.svgz cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-player_end.png cr16-action-fileopen.png cr128-app-password.png cr48-mime-source_moc.png cr64-mime-source_php.png cr22-action-encrypted.png cr22-action-make_kdevelop.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr48-filesys-file_broken.png cr64-action-player_play.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr128-mime-pdf.png cr22-action-pencil.png cr16-action-text_center.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png cr16-action-eraser.png cr128-mime-font.png crsc-device-hdd_unmount.svgz cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png crsc-action-down.svgz cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-filesys-zip_overlay.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr16-action-lock.png cr22-action-music_halfnote.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr22-action-view_choose.png cr16-action-remove.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-filesys-folder_blue.svgz crsc-action-text_bild.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr48-filesys-folder_yellow.png cr22-action-project_open.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr22-action-music_dottednote.png cr128-mime-readme.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png cr32-mime-txt2.png cr22-action-mail_reply.png crsc-mime-source_s.svgz cr32-device-usbpendrive_mount.png cr128-mime-resource.png cr16-mime-core.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr16-filesys-lock_overlay.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png crsc-device-ipod_mount.svgz cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr16-action-viewmag+.png cr16-action-exit.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png crsc-mime-pk.svgz cr32-action-exit.png cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-mime-rpm.png cr16-action-reload.png cr64-mime-readme.png cr22-mime-rpm.png cr16-filesys-folder.png cr64-device-zip_mount.png cr48-app-kmenu.png crsc-app-kttsd.svgz cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr22-action-halfencrypted.png cr16-device-cdwriter_unmount.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr16-action-reload_page.png cr32-action-bookmarks_list_add.png cr128-mime-exec_wine.png cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png cr48-device-smart_media_mount.png crsc-action-text_super.svgz crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr32-action-add.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr16-action-music_sixteenthnote.png cr22-mime-source_p.png cr32-action-blend.png cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr16-filesys-file_broken.png cr22-mime-kchart_chrt.png cr64-filesys-folder_important.png crsc-mime-shellscript.svgz crsc-filesys-folder_yellow_open.svgz cr22-filesys-folder_grey_open.png cr16-action-charset.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png crsc-filesys-folder_violet_open.svgz cr16-action-edittrash.png cr16-device-memory_stick_mount.png cr16-action-rotate.png cr16-action-connect_no.png cr16-action-frame_query.png cr22-action-about_kde.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-source.png cr32-action-math_paren.png cr32-mime-kugar_kud.png cr32-action-math_rsub.png cr128-mime-source_j.png cr22-action-view_fit_width.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png crsc-filesys-folder_txt.svgz cr16-mime-deb.png cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr16-action-back.png cr48-mime-karbon_karbon.png cr128-filesys-folder_txt.png crsc-mime-tgz.svgz cr32-mime-kspread_ksp.png crsc-mime-log.svgz cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-player_pause.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png cr64-mime-font_truetype.png crsc-mime-file_temporary.svgz cr22-mime-readme.png cr48-mime-source_cpp.png cr32-action-gohome.png cr16-mime-source_py.png cr128-app-kttsd.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr22-action-top.png cr16-action-view_icon.png cr32-action-emptytrash.png cr22-action-signature.png cr16-device-mo_unmount.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr32-action-player_play.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr48-filesys-folder_html.png cr22-action-centrejust.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr16-action-rotate_cw.png cr48-action-eraser.png cr64-mime-pk.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr22-action-view_fit_height.png cr32-action-contexthelp.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr16-action-math_brace.png cr22-mime-vcalendar.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-kchart_chrt.png cr16-mime-txt2.png cr16-mime-binary.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr64-device-cdwriter_mount.png cr48-mime-midi.png cr48-mime-font.png cr32-mime-kformula_kfo.png cr64-device-system.png cr22-action-add.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr22-filesys-folder_red_open.png cr22-action-player_stop.png cr32-action-connect_creating.png cr64-mime-colorscm.png crsc-mime-koffice.svgz cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr22-device-sd_mmc_unmount.png cr16-action-find.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-mail_reply.png cr32-action-wizard.png cr64-device-mouse.png cr16-mime-source_h.png cr128-filesys-folder_tar.png cr22-action-run.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr32-action-mail_find.png cr128-filesys-network.png cr32-action-view_bottom.png crsc-device-compact_flash_unmount.svgz crsc-mime-message.svgz cr16-action-math_brackets.png cr48-filesys-folder_green_open.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr22-action-move.png cr48-mime-soffice.png cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr48-mime-video.png cr22-action-contexthelp.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.png cr32-action-about_kde.png crsc-action-reload_page.svgz cr16-action-connect_creating.png crsc-action-about_kde.svgz cr16-action-window_new.png crsc-mime-man.svgz crsc-action-add.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr64-mime-kivio_flw.png cr128-mime-karbon_karbon.png cr48-filesys-folder_important.png cr48-filesys-exec.png cr48-filesys-network_local.png cr48-mime-kword_kwd.png cr32-action-math_prod.png cr16-device-ipod_unmount.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr64-device-dvd_mount.png cr128-mime-recycled.png crsc-action-player_fwd.svgz cr32-mime-cdr.png cr22-action-mail_new.png cr32-mime-krita_kra.png cr22-device-compact_flash_unmount.png cr128-device-memory_stick_mount.png crsc-action-player_pause.svgz cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz cr64-filesys-folder_orange_open.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr32-action-view_fit_height.png cr22-action-colorpicker.png cr48-device-joystick.png crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr128-filesys-network_local.png cr32-action-make_kdevelop.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr32-mime-source_s.png cr16-filesys-folder_video.png crsc-mime-make.svgz cr64-filesys-folder_txt.png cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr48-filesys-folder_green.png cr22-action-color_fill.png cr48-filesys-folder_violet_open.png cr32-filesys-folder_favorite.png cr22-action-math_frac.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr32-action-fileimport.png cr22-mime-midi.png cr64-mime-core.png cr32-action-colorize.png cr22-action-filefind.png cr64-filesys-folder_locked.png cr32-action-view_tree.png cr64-device-hdd_mount.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png cr32-filesys-folder_grey_open.png cr32-action-math_matrix.png cr48-device-scanner.png cr128-mime-dvi.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png crsc-action-reload.svgz cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr128-mime-document2.png cr32-device-compact_flash_unmount.png cr32-action-indent.png cr16-action-bookmark.png crsc-mime-recycled.svgz cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr48-device-cdwriter_unmount.png cr16-action-kde5.png cr32-action-top.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr16-action-contents.png cr128-filesys-folder_favorite.png cr16-action-frame_spreadsheet.png cr22-mime-koffice.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png cr22-action-reload3.png crsc-device-blockdevice.svgz cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png cr16-action-tab_remove.png crsc-filesys-folder_man2.svgz cr48-mime-kugar_kud.png cr22-action-mouse.png cr22-mime-source_java.png crsc-app-kmenu.svgz crsc-mime-source_java.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr32-action-switchuser.png cr48-action-colorpicker.png cr48-mime-template_source.png crsc-action-view_fit_height.svgz crsc-action-text_bold.svgz cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr32-mime-cdimage.png cr16-filesys-desktop.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr64-filesys-folder_yellow.png cr32-action-finish.png cr32-mime-karbon_karbon.png cr16-action-1uparrow.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-action-player_rew.svgz crsc-filesys-folder_sound.svgz cr16-action-wizard.png cr128-filesys-file_broken.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr48-device-chardevice.png cr32-mime-vcard.png cr22-filesys-folder_print.png cr48-mime-source_s.png cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz crsc-action-exit.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png cr16-action-services.png crsc-mime-txt2.svgz cr22-action-mail_replylist.png cr64-device-mo_mount.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr64-mime-source_h.png cr22-mime-source_s.png cr32-action-player_fwd.png cr48-mime-log.png cr64-filesys-network_local.png cr22-action-rebuild.png cr32-device-print_class.png cr48-action-lock.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png crsc-action-fileclose.svgz cr32-action-view_fit_window.png cr16-device-print_class.png crsc-mime-source_c.svgz crsc-action-rotate_cw.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png crsc-device-mo_umount.svgz cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr32-device-joystick.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr128-device-compact_flash_mount.png cr32-action-view_icon.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr128-mime-widget_doc.png cr64-filesys-folder_yellow_open.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr32-action-connect_established.png cr16-action-fileimport.png cr128-filesys-folder_orange_open.png cr22-mime-file_locked.png cr16-mime-source_s.png cr16-mime-source_l.png cr22-action-bookmark_folder.png crsc-filesys-folder_important.svgz cr64-mime-source_j.png cr22-mime-kexi_kexi.png cr22-mime-source_c.png crsc-filesys-file_locked.svgz cr16-filesys-folder_home.png cr32-action-help.png crsc-device-joystick.svgz cr128-mime-ascii.png crsc-action-filenew.svgz cr22-app-password.png cr16-action-mail_send.png cr128-filesys-folder_important.png crsc-filesys-pipe.svgz cr48-mime-metafont.png cr22-action-gear.png cr48-action-filenew.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr64-device-ipod_mount.png cr32-action-view_right.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr48-mime-pdf.png cr32-action-contents2.png cr16-action-window_fullscreen.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr16-action-2leftarrow.png cr48-mime-kivio_flw.png cr48-device-dvd_mount.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png cr16-filesys-folder_orange.png cr32-mime-recycled.png cr48-action-remove.png crsc-filesys-folder_green_open.svgz cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-mime-mozilla_doc.png crsc-action-previous.svgz cr64-device-5floppy_unmount.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr32-filesys-network_local.png cr22-mime-netscape_doc.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr32-mime-zip.png cr128-app-kmenu.png cr48-device-camera_unmount.png cr128-filesys-lock_overlay.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr22-device-ipod_unmount.png cr32-mime-deb.png cr16-mime-quicktime.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_txt.png cr48-filesys-folder_home.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr48-filesys-folder_outbox.png cr32-mime-file_locked.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr16-device-pda_blue.png cr22-action-text_bold.png cr32-action-text_super.png cr32-device-compact_flash_mount.png cr22-action-remove.png crsc-mime-readme.svgz cr64-mime-source_f.png cr128-mime-source_o.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr48-action-forward.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr22-action-mail_post_to3.png cr64-filesys-folder_sound.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png crsc-mime-source_py.svgz cr16-action-view_tree.png cr16-action-view_fit_height.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr48-filesys-folder_orange_open.png cr22-action-mail_replyall.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr128-filesys-folder_image.png cr22-action-music_flat.png cr22-mime-message.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr64-filesys-folder_favorite.png cr48-mime-deb.png cr32-mime-source_java.png cr128-filesys-folder_locked.png cr22-action-music_natur.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr16-action-view_fit_window.png cr128-device-ipod_mount.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png crsc-action-share.svgz cr22-action-music_fullnote.png cr32-filesys-folder_important.png cr128-mime-krita_kra.png crsc-mime-cdr.svgz cr48-action-stop.png cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr22-action-previous.png cr16-action-colorpicker.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz crsc-action-player_eject.svgz cr32-action-view_text.png cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr48-device-hdd_mount.png cr32-action-text_center.png cr16-action-tab_breakoff.png cr48-mime-kpresenter_kpr.png cr32-action-mail_send.png cr48-action-add.png cr16-action-kde.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr64-mime-midi.png cr16-mime-kspread_ksp.png cr16-action-folder_new.png cr22-action-exit.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr32-filesys-folder_open.png cr64-mime-source_s.png cr16-action-ok.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr32-action-previous.png cr22-mime-karbon_karbon.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz crsc-mime-widget_doc.svgz cr22-mime-quicktime.png cr64-filesys-trashcan_full.png cr22-device-hdd_unmount.png crsc-mime-kexi_kexi.svgz cr64-filesys-folder_violet_open.png cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr32-mime-source_f.png cr16-action-contexthelp.png cr16-action-editshred.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr22-mime-vcard.png cr16-mime-widget_doc.png cr22-action-player_pause.png cr48-app-password.png cr128-filesys-pipe.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr16-action-tab_new_raised.png cr16-mime-kivio_flw.png cr48-mime-kspread_ksp.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png cr22-filesys-link_overlay.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr64-device-joystick.png cr48-filesys-folder_red_open.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr16-mime-dvi.png cr64-filesys-folder_home.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr32-action-show_side_panel.png cr128-filesys-folder_green_open.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png cr16-action-text_super.png crsc-filesys-folder.svgz cr16-action-locationbar_erase.png cr64-filesys-folder_open.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr48-device-ipod_mount.png cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr32-device-ipod_unmount.png cr22-mime-applix.png cr22-action-math_lsub.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr32-filesys-pipe.png cr22-action-back.png cr32-filesys-folder_orange.png cr64-device-memory.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr48-mime-netscape_doc.png cr22-action-reload.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr32-action-editdelete.png cr16-device-3floppy_unmount.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr16-action-filequickprint.png cr32-mime-empty.png cr128-device-print_class.png cr16-filesys-trashcan_empty.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-mime-tex.png cr32-action-filesave.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png crsc-filesys-folder_violet.svgz cr16-action-filter.png cr32-mime-font_truetype.png cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-music_fermatenote.png cr22-action-view_detailed.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-mime-resource.png cr32-action-text_sub.png cr16-action-music_natur.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr48-action-reload.png cr22-mime-source_moc.png cr16-mime-make.png cr22-action-1downarrow.png cr128-mime-cdr.png cr22-action-player_playlist.png cr48-device-mo_unmount.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr32-action-run.png cr64-mime-tgz.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr128-filesys-folder_grey.png cr32-mime-ascii.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr32-action-fileclose.png cr22-action-misc.png cr22-action-text_under.png crsc-action-player_stop.svgz cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png cr16-mime-txt.png crsc-filesys-folder_man.svgz cr16-action-player_pause.png cr16-action-player_stop.png cr22-device-smart_media_unmount.png cr128-mime-soffice.png cr22-action-rightjust.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-compfile.png cr22-action-inline_image.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-mime-rpm.png cr32-action-queue.png crsc-action-mail_get.svgz cr48-action-mail_new.png cr48-filesys-folder_red.png crsc-mime-quicktime.svgz cr48-action-rotate_cw.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png cr64-device-blockdevice.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr48-mime-shellscript.png cr128-mime-font_truetype.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr48-device-smart_media_unmount.png cr22-action-view_fit_window.png cr64-device-pda_black.png cr16-action-kde6.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png crsc-filesys-exec_wine.svgz cr32-action-mouse.png cr32-mime-postscript.png cr22-mime-kivio_flw.png cr32-device-memory.png cr16-app-kttsd.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr16-mime-source_o.png cr32-action-save_all.png cr48-action-reload_all_tabs.png cr16-filesys-server.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr16-device-blockdevice.png cr32-device-pda_blue.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr16-device-mo_mount.png cr22-action-player_end.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr16-mime-message.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr22-device-ipod_mount.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr22-action-editclear.png cr16-action-frameprint.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr64-mime-vectorgfx.png cr22-mime-recycled.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr32-action-button_ok.png cr48-filesys-folder_open.png cr32-action-attach.png crsc-action-rotate_ccw.svgz cr32-action-exec.png cr22-mime-txt2.png crsc-mime-netscape_doc.svgz cr22-action-redo.png cr64-filesys-folder_violet.png cr16-filesys-folder_red_open.png cr64-mime-source_o.png cr22-action-filesave.png cr48-mime-misc.png cr16-action-view_text.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png crsc-mime-html.svgz cr16-action-kde3.png cr22-action-revert.png cr128-filesys-folder_home.png cr16-device-compact_flash_mount.png cr32-action-compfile.png cr128-mime-info.png crsc-action-text_italic.svgz cr48-mime-exec_wine.png cr32-mime-source_y.png cr16-action-identity.png cr16-action-rotate_ccw.png cr32-device-nfs_unmount.png cr22-action-connect_no.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr22-action-toggle_log.png cr16-filesys-folder_violet.png cr22-action-math_onetwomatrix.png cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png crsc-mime-document.svgz cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr22-action-math_brackets.png cr32-mime-kword_kwd.png cr16-mime-ascii.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr32-device-tv.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png crsc-filesys-folder_tar.svgz cr32-action-mail_get.png cr128-mime-document.png cr64-device-3floppy_mount.png cr16-action-view_top_bottom.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png crsc-mime-source_pl.svgz cr22-filesys-folder_open.png cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png cr48-action-gohome.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr48-mime-tar.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr48-mime-widget_doc.png cr22-device-usbpendrive_mount.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr128-filesys-zip_overlay.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr128-mime-message.png cr22-action-today.png cr16-action-bottom.png cr64-mime-font.png cr32-filesys-folder_tar.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr16-mime-source_moc.png cr22-action-window_nofullscreen.png cr16-device-cdrom_mount.png cr48-mime-readme.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png crsc-action-stop.svgz crsc-action-remove.svgz cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png cr32-filesys-folder_sound.png crsc-action-contents2.svgz cr22-action-math_int.png cr128-filesys-folder_violet.png cr32-filesys-lock_overlay.png cr64-mime-source_l.png cr64-device-hdd_unmount.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-gf.png cr16-filesys-folder_print.png cr128-mime-source_p.png crsc-device-zip_mount.svgz cr32-mime-pk.png cr16-action-mail_post_to.png cr16-device-system.png cr64-mime-source_p.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr16-action-add.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr16-action-1leftarrow.png cr22-action-editshred.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr22-action-edittrash.png cr128-mime-spreadsheet.png cr32-action-unindent.png cr16-device-ipod_mount.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr16-device-mouse.png cr22-mime-encrypted.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr22-action-fileclose.png cr22-action-next.png cr32-mime-unknown.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-koffice.png cr48-mime-postscript.png cr16-action-player_rew.png cr16-action-stop.png cr16-action-fontsizedown.png cr32-action-filenew.png cr48-action-indent.png cr16-action-math_onetwomatrix.png cr16-action-connect_established.png cr16-action-editcut.png cr32-mime-font.png cr64-mime-karbon_karbon.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr22-mime-font_truetype.png cr16-action-music_flat.png cr48-device-camera_mount.png cr22-action-frame_image.png crsc-action-view_fit_width.svgz cr16-action-thumbnail.png cr32-mime-soffice.png crsc-action-up.svgz cr48-device-system.png cr48-mime-font_bitmap.png cr22-action-idea.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr16-action-player_playlist.png cr32-mime-core.png cr64-filesys-zip_overlay.png cr16-filesys-folder_open.png cr32-mime-source_cpp.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr16-action-mail_new.png cr48-mime-recycled.png cr32-action-view_fit_width.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-action-switchuser.png cr32-filesys-folder_man.png cr16-action-colorize.png cr22-mime-tex.png crsc-mime-tex.svgz cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr22-mime-font.png crsc-mime-postscript.svgz cr16-action-viewmagfit.png crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr32-action-spellcheck.png cr22-mime-kspread_ksp.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr64-mime-source_cpp.png cr64-device-ipod_unmount.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-mime-core.png cr128-device-hdd_mount.png cr64-device-5floppy_mount.png cr64-device-mo_unmount.png cr64-mime-info.png cr64-filesys-trashcan_empty.png cr64-filesys-lock_overlay.png cr22-action-editpaste.png cr32-action-text_italic.png cr22-action-folder.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-bookmark_folder.png cr16-action-project_open.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png crsc-filesys-zip_overlay.svgz cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr32-filesys-folder_red.png cr22-action-news_subscribe.png cr32-mime-source_h.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr48-mime-source_java.png cr16-action-transform.png cr128-mime-txt2.png cr16-action-viewmag-.png cr16-device-dvd_unmount.png cr32-mime-applix.png cr32-action-reload_page.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png crsc-mime-gf.svgz cr16-action-completion.png cr64-device-tablet.png cr22-device-3floppy_unmount.png cr32-device-ipod_mount.png cr64-mime-txt.png cr32-action-viewmag+.png cr16-device-memory.png cr48-mime-font_type1.png cr16-mime-kugar_kud.png cr48-device-printer1.png crsc-action-text_under.svgz cr32-action-undo.png cr16-filesys-pipe.png cr32-filesys-folder_print.png cr16-mime-zip.png cr22-action-view_sidetree.png cr48-mime-empty.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png crsc-action-view_fit_window.svgz cr22-action-show_side_panel.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png crsc-action-top.svgz cr64-mime-metafont.png crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr22-action-math_prod.png cr128-mime-sound.png cr128-device-memory_stick_unmount.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr32-action-editclear.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr22-action-music_cleficon.png cr22-action-view_tree.png cr64-mime-font_bitmap.png cr48-mime-wordprocessing.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr128-action-launch.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr32-mime-quicktime.png cr64-filesys-folder_image.png cr16-mime-unknown.png cr32-device-smart_media_mount.png crsc-action-player_start.svgz cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png crsc-action-gohome.svgz cr128-mime-vectorgfx.png cr16-mime-gf.png cr32-action-kde.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-device-smart_media_unmount.png cr16-action-contents2.png cr22-filesys-folder_home.png cr22-mime-source.png cr16-filesys-link_overlay.png cr22-action-math_paren.png cr64-device-dvd_unmount.png cr48-device-5floppy_mount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr16-action-switchuser.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr48-device-compact_flash_unmount.png cr128-device-blockdevice.png
-+KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png cr32-mime-template_source.png crsc-filesys-folder_favorite.svgz crsc-mime-zip.svgz cr16-action-about_kde.png cr32-action-mail_post_to.png cr48-action-rotate_ccw.png cr16-mime-tar.png cr64-mime-exec_wine.png cr16-device-hdd_mount.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr22-action-player_eject.png cr32-mime-exec_wine.png cr22-mime-tgz.png cr32-action-text_block.png crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png crsc-action-eraser.svgz cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr32-action-leftjust.png cr48-device-ipod_unmount.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr64-mime-html.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr64-device-smart_media_mount.png cr32-device-cdwriter_unmount.png cr48-mime-source_o.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-mime-encrypted.png cr48-action-frameprint.png cr32-mime-make.png cr22-action-thumbnail.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr16-mime-postscript.png cr32-filesys-desktop.png cr32-mime-pdf.png cr16-action-text.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr16-action-save_all.png cr64-mime-gf.png cr128-mime-metafont.png cr48-mime-txt.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr48-filesys-folder_violet.png cr128-mime-source.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png crsc-action-back.svgz cr22-mime-info.png cr32-action-bookmark_folder.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr22-action-mail_new3.png cr128-mime-source_f.png cr48-action-reload_page.png cr16-mime-misc.png cr16-action-player_play.png cr128-filesys-link_overlay.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png crsc-action-bottom.svgz cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-fileopen.png cr16-action-player_end.png cr64-mime-source_php.png cr48-mime-source_moc.png cr128-app-password.png cr22-action-make_kdevelop.png cr22-action-encrypted.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr64-action-player_play.png cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr48-action-filequickprint.png cr64-device-cdaudio_mount.png cr128-mime-pdf.png cr16-action-text_center.png cr22-action-pencil.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png crsc-device-hdd_unmount.svgz cr128-mime-font.png cr16-action-eraser.png cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png crsc-action-down.svgz cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-filesys-zip_overlay.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-action-music_halfnote.png cr16-action-lock.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr16-action-remove.png cr22-action-view_choose.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-action-text_bild.svgz crsc-filesys-folder_blue.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr128-mime-readme.png cr22-action-music_dottednote.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png crsc-mime-source_s.svgz cr32-mime-txt2.png cr22-action-mail_reply.png cr32-device-usbpendrive_mount.png cr16-mime-core.png cr128-mime-resource.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr16-filesys-lock_overlay.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png crsc-device-ipod_mount.svgz cr16-action-exit.png cr16-action-viewmag+.png cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png cr32-action-exit.png crsc-mime-pk.svgz cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-action-reload.png cr16-mime-rpm.png cr64-mime-readme.png cr16-filesys-folder.png cr22-mime-rpm.png cr64-device-zip_mount.png cr48-app-kmenu.png crsc-app-kttsd.svgz cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr16-device-cdwriter_unmount.png cr22-action-halfencrypted.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr128-mime-exec_wine.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png crsc-action-text_super.svgz cr48-device-smart_media_mount.png crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr32-action-add.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr22-mime-kchart_chrt.png cr16-filesys-file_broken.png crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr16-action-charset.png cr22-filesys-folder_grey_open.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz crsc-filesys-folder_violet_open.svgz cr22-action-player_fwd.png cr16-device-memory_stick_mount.png cr16-action-edittrash.png cr16-action-rotate.png cr16-action-connect_no.png cr22-action-about_kde.png cr16-action-frame_query.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-kugar_kud.png cr32-action-math_paren.png cr32-mime-source.png cr32-action-math_rsub.png cr128-mime-source_j.png cr22-action-view_fit_width.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png cr16-mime-deb.png crsc-filesys-folder_txt.svgz cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr48-mime-karbon_karbon.png cr16-action-back.png crsc-mime-tgz.svgz cr128-filesys-folder_txt.png crsc-mime-log.svgz cr32-mime-kspread_ksp.png cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr32-action-player_pause.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png crsc-mime-file_temporary.svgz cr64-mime-font_truetype.png cr22-mime-readme.png cr32-action-gohome.png cr16-mime-source_py.png cr48-mime-source_cpp.png cr128-app-kttsd.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr16-action-view_icon.png cr22-action-top.png cr32-action-emptytrash.png cr16-device-mo_unmount.png cr22-action-signature.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr22-action-centrejust.png cr48-filesys-folder_html.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr48-action-eraser.png cr64-mime-pk.png cr16-action-rotate_cw.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr22-action-view_fit_height.png cr32-action-contexthelp.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr22-mime-vcalendar.png cr16-action-math_brace.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-binary.png cr16-mime-txt2.png cr16-mime-kchart_chrt.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr48-mime-midi.png cr64-device-cdwriter_mount.png cr32-mime-kformula_kfo.png cr48-mime-font.png cr64-device-system.png cr16-mime-font.png cr22-action-add.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr22-mime-document.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr32-action-connect_creating.png cr22-action-player_stop.png cr22-filesys-folder_red_open.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr16-action-find.png cr22-device-sd_mmc_unmount.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-wizard.png cr32-action-mail_reply.png cr64-device-mouse.png cr16-mime-source_h.png cr22-action-run.png cr128-filesys-folder_tar.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr128-filesys-network.png crsc-device-compact_flash_unmount.svgz cr32-action-view_bottom.png cr32-action-mail_find.png crsc-mime-message.svgz cr16-action-math_brackets.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr48-filesys-folder_green_open.png cr22-action-move.png cr48-mime-soffice.png cr16-action-no.png cr22-device-sd_mmc_mount.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.png crsc-action-reload_page.svgz cr32-action-about_kde.png cr16-action-connect_creating.png crsc-mime-man.svgz cr16-action-window_new.png crsc-action-about_kde.svgz cr22-filesys-www.png crsc-action-add.svgz cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.png cr32-action-math_prod.png cr48-mime-kword_kwd.png cr16-device-ipod_unmount.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr128-mime-recycled.png cr64-device-dvd_mount.png crsc-action-player_fwd.svgz cr22-action-mail_new.png cr32-mime-cdr.png cr22-device-compact_flash_unmount.png cr32-mime-krita_kra.png crsc-action-player_pause.svgz cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr22-action-colorpicker.png cr32-action-view_fit_height.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr16-mime-readme.png cr48-filesys-folder_tar.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr22-action-color_fill.png cr48-filesys-folder_green.png cr48-filesys-folder_violet_open.png cr22-action-math_frac.png cr32-filesys-folder_favorite.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr22-mime-midi.png cr32-action-fileimport.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.png cr64-device-hdd_mount.png cr32-action-view_tree.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png cr32-filesys-folder_grey_open.png cr48-device-scanner.png cr128-mime-dvi.png cr32-action-math_matrix.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png crsc-action-reload.svgz cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr32-device-compact_flash_unmount.png cr128-mime-document2.png cr32-action-indent.png crsc-mime-recycled.svgz cr16-action-bookmark.png cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr32-action-top.png cr16-action-kde5.png cr48-device-cdwriter_unmount.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr22-mime-koffice.png cr16-action-frame_spreadsheet.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png crsc-device-blockdevice.svgz cr22-action-reload3.png cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png crsc-filesys-folder_man2.svgz cr16-action-tab_remove.png cr48-mime-kugar_kud.png cr22-action-mouse.png crsc-app-kmenu.svgz cr22-mime-source_java.png crsc-mime-source_java.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr32-action-switchuser.png cr16-device-tablet.png cr48-mime-template_source.png cr48-action-colorpicker.png crsc-action-view_fit_height.svgz crsc-action-text_bold.svgz cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz crsc-action-player_rew.svgz cr128-filesys-file_broken.png cr16-action-wizard.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-device-chardevice.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png crsc-mime-txt2.svgz cr16-action-services.png cr64-device-mo_mount.png cr22-action-mail_replylist.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr32-action-player_fwd.png cr64-mime-source_h.png cr22-mime-source_s.png cr64-filesys-network_local.png cr48-mime-log.png cr22-action-rebuild.png cr48-action-lock.png cr32-device-print_class.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png crsc-action-fileclose.svgz cr16-device-print_class.png cr32-action-view_fit_window.png crsc-mime-source_c.svgz crsc-action-rotate_cw.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png cr16-action-redo.png crsc-device-mo_umount.svgz cr16-filesys-folder_outbox.png cr32-device-joystick.png cr22-action-fill.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr32-action-view_icon.png cr128-device-compact_flash_mount.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr64-filesys-folder_yellow_open.png cr128-mime-widget_doc.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr16-action-fileimport.png cr32-action-connect_established.png cr22-mime-file_locked.png cr128-filesys-folder_orange_open.png cr16-mime-source_s.png cr16-mime-source_l.png crsc-filesys-folder_important.svgz cr22-action-bookmark_folder.png cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr16-filesys-folder_home.png cr32-action-help.png crsc-filesys-file_locked.svgz crsc-device-joystick.svgz crsc-action-filenew.svgz cr128-mime-ascii.png cr22-app-password.png cr128-filesys-folder_important.png cr16-action-mail_send.png cr48-mime-metafont.png crsc-filesys-pipe.svgz cr48-action-filenew.png cr22-action-gear.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-ipod_mount.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr16-action-window_fullscreen.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr48-device-dvd_mount.png cr48-mime-kivio_flw.png cr16-action-2leftarrow.png cr48-device-zip_mount.png cr32-action-revert.png cr22-action-player_play.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.png cr48-action-remove.png cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-device-5floppy_unmount.png cr64-mime-mozilla_doc.png crsc-action-previous.svgz cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr22-mime-netscape_doc.png cr32-filesys-network_local.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-action-misc.png cr48-mime-source_p.png cr128-app-kmenu.png crsc-mime-source_h.svgz cr32-mime-zip.png cr48-device-camera_unmount.png cr16-mime-resource.png cr128-filesys-lock_overlay.png cr16-action-editpaste.png cr32-action-misc.png cr22-device-ipod_unmount.png cr22-action-fileexport.png cr16-mime-quicktime.png cr32-mime-deb.png cr64-mime-source_java.png cr48-filesys-folder_home.png cr48-filesys-folder_txt.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr22-action-text_bold.png cr16-device-pda_blue.png cr32-action-text_super.png crsc-mime-readme.svgz cr128-mime-source_o.png cr64-mime-source_f.png cr22-action-remove.png cr32-device-compact_flash_mount.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr128-device-printer1.png cr22-filesys-folder_orange.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr64-filesys-folder_sound.png cr22-action-mail_post_to3.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr16-action-view_fit_height.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr22-action-mail_replyall.png cr48-filesys-folder_orange_open.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-mime-message.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr48-mime-deb.png cr32-mime-source_java.png cr64-filesys-folder_favorite.png cr22-action-music_natur.png cr128-filesys-folder_locked.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr16-action-view_fit_window.png cr128-device-ipod_mount.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz crsc-mime-cdr.svgz cr32-filesys-folder_important.png cr128-mime-krita_kra.png cr16-action-inline_image.png cr48-action-stop.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr16-action-colorpicker.png cr22-action-previous.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png crsc-action-player_eject.svgz cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr32-action-text_center.png cr48-device-hdd_mount.png cr48-mime-kpresenter_kpr.png cr16-action-tab_breakoff.png cr32-action-mail_send.png cr48-action-add.png cr16-action-kde.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr16-mime-kspread_ksp.png cr64-mime-midi.png cr22-action-exit.png cr16-action-folder_new.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr22-mime-karbon_karbon.png cr32-action-previous.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz cr22-mime-quicktime.png crsc-mime-widget_doc.svgz cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.png cr64-filesys-folder_violet_open.png crsc-mime-kexi_kexi.svgz cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr16-action-contexthelp.png cr16-action-editshred.png cr32-mime-source_f.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.png crsc-mime-font_type1.svgz cr128-filesys-folder_html.png crsc-device-nfs_unmount.svgz cr22-action-contents2.png crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr48-mime-kspread_ksp.png cr16-mime-kivio_flw.png cr16-action-tab_new_raised.png cr16-mime-empty.png cr64-mime-image.png cr64-mime-spreadsheet.png crsc-device-3floppy_mount.svgz cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png cr22-filesys-link_overlay.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr48-filesys-folder_red_open.png cr64-device-joystick.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-action-show_side_panel.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png crsc-filesys-folder.svgz cr16-action-text_super.png cr64-filesys-folder_open.png cr16-action-locationbar_erase.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr48-device-ipod_mount.png cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr32-device-ipod_unmount.png cr22-action-math_lsub.png cr22-mime-applix.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr64-device-memory.png cr32-filesys-folder_orange.png cr22-action-back.png cr32-filesys-pipe.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png crsc-device-system.svgz cr22-action-view_bottom.png cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr22-action-reload.png cr48-mime-netscape_doc.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-action-charset.png cr32-mime-source_p.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr16-device-3floppy_unmount.png cr32-action-editdelete.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr32-mime-empty.png cr16-action-filequickprint.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-action-filesave.png cr32-mime-tex.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png cr16-action-filter.png cr32-mime-font_truetype.png crsc-filesys-folder_violet.svgz cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-view_detailed.png cr22-action-music_fermatenote.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-action-text_sub.png cr16-action-music_natur.png cr32-mime-resource.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr48-action-reload.png cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr128-mime-cdr.png cr48-device-mo_unmount.png cr22-action-player_playlist.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr64-mime-tgz.png cr32-action-run.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr32-mime-ascii.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz crsc-action-player_stop.svgz cr22-action-misc.png cr32-action-fileclose.png cr22-action-text_under.png cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png crsc-filesys-folder_man.svgz cr16-mime-txt.png cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr22-action-rightjust.png cr128-mime-soffice.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-inline_image.png cr22-action-compfile.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-action-queue.png cr32-mime-rpm.png crsc-action-mail_get.svgz cr48-action-mail_new.png crsc-mime-quicktime.svgz cr48-filesys-folder_red.png cr48-action-rotate_cw.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr64-device-blockdevice.png cr128-mime-font_truetype.png cr48-mime-shellscript.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr48-device-smart_media_unmount.png cr22-action-view_fit_window.png cr64-device-pda_black.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png cr32-action-mouse.png crsc-filesys-exec_wine.svgz cr32-mime-postscript.png cr32-device-memory.png cr22-mime-kivio_flw.png cr16-app-kttsd.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr32-action-save_all.png cr16-mime-source_o.png cr16-filesys-server.png cr48-action-reload_all_tabs.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr32-device-pda_blue.png cr16-device-blockdevice.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png cr16-device-mo_mount.png cr22-action-player_end.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png cr16-mime-message.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr22-device-ipod_mount.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr16-action-frameprint.png cr22-action-editclear.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr22-mime-recycled.png cr64-mime-vectorgfx.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr48-filesys-folder_open.png cr32-action-button_ok.png crsc-action-rotate_ccw.svgz cr32-action-attach.png cr32-action-exec.png crsc-mime-netscape_doc.svgz cr22-mime-txt2.png cr22-action-redo.png cr64-filesys-folder_violet.png cr64-mime-source_o.png cr16-filesys-folder_red_open.png cr48-mime-misc.png cr22-action-filesave.png cr16-action-view_text.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png crsc-mime-html.svgz cr16-action-kde3.png cr16-device-compact_flash_mount.png cr128-filesys-folder_home.png cr22-action-revert.png cr32-action-compfile.png crsc-action-text_italic.svgz cr128-mime-info.png cr48-mime-exec_wine.png cr16-action-identity.png cr32-mime-source_y.png cr16-action-rotate_ccw.png cr22-action-connect_no.png cr32-device-nfs_unmount.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-player_start.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png cr64-mime-message.png crsc-mime-document.svgz cr16-action-decrypted.png cr22-action-identity.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr32-mime-kword_kwd.png cr22-action-math_brackets.png cr16-mime-ascii.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr128-mime-font_bitmap.png cr32-device-tv.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png cr32-action-mail_get.png crsc-filesys-folder_tar.svgz cr128-mime-document.png cr16-action-view_top_bottom.png cr64-device-3floppy_mount.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr22-filesys-folder_open.png crsc-mime-source_pl.svgz cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr48-action-gohome.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr128-device-sd_mmc_unmount.png cr48-mime-tar.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr128-filesys-zip_overlay.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-filesys-folder_man.png cr16-action-stamp.png cr22-action-text_super.png cr32-action-folder_new.png cr16-action-mail_find.png cr128-mime-message.png cr22-action-today.png cr64-mime-kugar_kud.png cr16-action-bottom.png cr22-action-button_ok.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr48-mime-readme.png cr16-mime-source_moc.png cr16-device-cdrom_mount.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png crsc-action-stop.svgz cr16-action-pencil.png crsc-action-remove.svgz cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr22-action-math_int.png cr128-filesys-folder_violet.png cr32-filesys-lock_overlay.png cr64-device-hdd_unmount.png cr64-mime-source_l.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr128-mime-gf.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-source_p.png cr16-filesys-folder_print.png crsc-device-zip_mount.svgz cr32-mime-pk.png cr16-action-mail_post_to.png cr64-mime-source_p.png cr16-device-system.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr16-action-add.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr22-action-editshred.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr128-mime-spreadsheet.png cr22-action-edittrash.png cr32-action-unindent.png cr16-device-ipod_mount.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr22-mime-encrypted.png cr16-device-mouse.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-next.png cr22-action-fileclose.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-connect_established.png cr16-action-math_onetwomatrix.png cr16-action-editcut.png cr64-mime-karbon_karbon.png cr32-mime-font.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr32-action-view_remove.png cr16-action-text_italic.png cr16-mime-document.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr16-action-music_flat.png cr22-mime-font_truetype.png cr48-device-camera_mount.png cr22-action-frame_image.png crsc-action-view_fit_width.svgz cr16-action-thumbnail.png cr32-mime-soffice.png crsc-action-up.svgz cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr32-mime-vectorgfx.png cr48-filesys-trashcan_full.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr16-action-player_playlist.png cr32-mime-core.png cr32-mime-source_cpp.png cr16-filesys-folder_open.png cr64-filesys-zip_overlay.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr48-mime-recycled.png cr16-action-mail_new.png cr32-action-view_fit_width.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-action-switchuser.png cr32-filesys-folder_man.png cr16-action-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr22-mime-font.png crsc-mime-postscript.svgz crsc-mime-core.svgz cr16-action-viewmagfit.png cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr32-action-music_quarternote.png cr128-filesys-trashcan_empty.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr64-device-ipod_unmount.png cr64-mime-source_cpp.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-device-hdd_mount.png cr128-mime-core.png cr64-device-5floppy_mount.png cr64-filesys-trashcan_empty.png cr64-mime-info.png cr64-device-mo_unmount.png cr64-filesys-lock_overlay.png cr22-action-editpaste.png cr22-action-folder.png cr32-action-text_italic.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-project_open.png cr16-action-bookmark_folder.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png crsc-filesys-zip_overlay.svgz cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr22-action-news_subscribe.png cr32-filesys-folder_red.png cr32-mime-source_h.png cr48-mime-source_java.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-mime-applix.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png cr16-action-completion.png crsc-mime-gf.svgz cr64-device-tablet.png cr22-device-3floppy_unmount.png cr32-device-ipod_mount.png cr64-mime-txt.png cr16-device-memory.png cr32-action-viewmag+.png cr48-mime-font_type1.png cr48-device-printer1.png cr16-mime-kugar_kud.png cr16-filesys-pipe.png crsc-action-text_under.svgz cr32-action-undo.png cr32-filesys-folder_print.png cr16-mime-zip.png cr48-mime-empty.png cr22-action-view_sidetree.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png crsc-action-view_fit_window.svgz cr22-action-show_side_panel.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png crsc-action-top.svgz crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr128-mime-sound.png cr22-action-math_prod.png cr128-device-memory_stick_unmount.png cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-action-music_cleficon.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-mime-source_cpp.png cr48-mime-wordprocessing.png cr64-mime-font_bitmap.png cr22-action-view_tree.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr128-action-launch.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr64-filesys-folder_image.png cr32-mime-quicktime.png cr16-mime-unknown.png cr32-device-smart_media_mount.png crsc-action-player_start.svgz cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png crsc-action-gohome.svgz cr128-mime-vectorgfx.png cr16-mime-gf.png cr32-action-kde.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-action-contents2.png cr16-device-smart_media_unmount.png cr22-filesys-folder_home.png cr16-filesys-link_overlay.png cr22-mime-source.png cr48-device-5floppy_mount.png cr22-action-math_paren.png cr64-device-dvd_unmount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-switchuser.png cr16-action-compfile.png cr32-mime-kmultiple.png cr128-device-blockdevice.png cr48-device-compact_flash_unmount.png
+-KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png cr16-action-about_kde.png crsc-mime-zip.svgz cr32-action-mail_post_to.png cr48-action-rotate_ccw.png cr16-mime-tar.png cr16-device-hdd_mount.png cr64-mime-exec_wine.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr32-mime-exec_wine.png cr22-action-player_eject.png cr22-mime-tgz.png cr32-action-messagebox_critical.png crsc-device-zip_unmount.svgz cr32-action-text_block.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png crsc-action-eraser.svgz cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr48-device-ipod_unmount.png cr16-action-2rightarrow.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr64-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr64-device-smart_media_mount.png cr48-mime-source_o.png cr32-device-cdwriter_unmount.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-action-frameprint.png cr48-mime-encrypted.png cr32-mime-make.png crsc-mime-source.svgz cr128-filesys-folder_yellow.png cr22-action-thumbnail.png cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr32-filesys-desktop.png cr16-mime-postscript.png cr16-action-text.png cr32-mime-pdf.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr64-mime-gf.png cr16-action-save_all.png cr48-mime-txt.png cr128-mime-metafont.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr128-mime-source.png cr48-filesys-folder_violet.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png cr32-action-bookmark_folder.png crsc-action-back.svgz cr22-mime-info.png cr22-action-mail_new3.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr48-action-reload_page.png cr128-mime-source_f.png cr16-mime-misc.png cr16-action-player_play.png cr128-filesys-link_overlay.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png crsc-action-bottom.svgz cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-player_end.png cr16-action-fileopen.png cr128-app-password.png cr48-mime-source_moc.png cr64-mime-source_php.png cr22-action-encrypted.png cr22-action-make_kdevelop.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr48-filesys-file_broken.png cr64-action-player_play.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr128-mime-pdf.png cr22-action-pencil.png cr16-action-text_center.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png cr16-action-eraser.png cr128-mime-font.png crsc-device-hdd_unmount.svgz cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png crsc-action-down.svgz cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-filesys-zip_overlay.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr16-action-lock.png cr22-action-music_halfnote.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr22-action-view_choose.png cr16-action-remove.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-filesys-folder_blue.svgz crsc-action-text_bild.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr48-filesys-folder_yellow.png cr22-action-project_open.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr22-action-music_dottednote.png cr128-mime-readme.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png cr32-mime-txt2.png cr22-action-mail_reply.png crsc-mime-source_s.svgz cr32-device-usbpendrive_mount.png cr128-mime-resource.png cr16-mime-core.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr16-filesys-lock_overlay.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png crsc-device-ipod_mount.svgz cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr16-action-viewmag+.png cr16-action-exit.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png crsc-mime-pk.svgz cr32-action-exit.png cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-mime-rpm.png cr16-action-reload.png cr64-mime-readme.png cr22-mime-rpm.png cr16-filesys-folder.png cr64-device-zip_mount.png cr48-app-kmenu.png crsc-app-kttsd.svgz cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr22-action-halfencrypted.png cr16-device-cdwriter_unmount.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr16-action-reload_page.png cr32-action-bookmarks_list_add.png cr128-mime-exec_wine.png cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png cr48-device-smart_media_mount.png crsc-action-text_super.svgz crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr32-action-add.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr16-action-music_sixteenthnote.png cr22-mime-source_p.png cr32-action-blend.png cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr16-filesys-file_broken.png cr22-mime-kchart_chrt.png cr64-filesys-folder_important.png crsc-mime-shellscript.svgz crsc-filesys-folder_yellow_open.svgz cr22-filesys-folder_grey_open.png cr16-action-charset.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png crsc-filesys-folder_violet_open.svgz cr16-action-edittrash.png cr16-device-memory_stick_mount.png cr16-action-rotate.png cr16-action-connect_no.png cr16-action-frame_query.png cr22-action-about_kde.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-source.png cr32-action-math_paren.png cr32-mime-kugar_kud.png cr32-action-math_rsub.png cr128-mime-source_j.png cr22-action-view_fit_width.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png crsc-filesys-folder_txt.svgz cr16-mime-deb.png cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr16-action-back.png cr48-mime-karbon_karbon.png cr128-filesys-folder_txt.png crsc-mime-tgz.svgz cr32-mime-kspread_ksp.png crsc-mime-log.svgz cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-player_pause.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png cr64-mime-font_truetype.png crsc-mime-file_temporary.svgz cr22-mime-readme.png cr48-mime-source_cpp.png cr32-action-gohome.png cr16-mime-source_py.png cr128-app-kttsd.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr22-action-top.png cr16-action-view_icon.png cr32-action-emptytrash.png cr22-action-signature.png cr16-device-mo_unmount.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr32-action-player_play.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr48-filesys-folder_html.png cr22-action-centrejust.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr16-action-rotate_cw.png cr48-action-eraser.png cr64-mime-pk.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr22-action-view_fit_height.png cr32-action-contexthelp.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr16-action-math_brace.png cr22-mime-vcalendar.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-kchart_chrt.png cr16-mime-txt2.png cr16-mime-binary.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr64-device-cdwriter_mount.png cr48-mime-midi.png cr48-mime-font.png cr32-mime-kformula_kfo.png cr64-device-system.png cr22-action-add.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr22-filesys-folder_red_open.png cr22-action-player_stop.png cr32-action-connect_creating.png cr64-mime-colorscm.png crsc-mime-koffice.svgz cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr22-device-sd_mmc_unmount.png cr16-action-find.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-mail_reply.png cr32-action-wizard.png cr64-device-mouse.png cr16-mime-source_h.png cr128-filesys-folder_tar.png cr22-action-run.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr32-action-mail_find.png cr128-filesys-network.png cr32-action-view_bottom.png crsc-device-compact_flash_unmount.svgz crsc-mime-message.svgz cr16-action-math_brackets.png cr48-filesys-folder_green_open.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr22-action-move.png cr48-mime-soffice.png cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr48-mime-video.png cr22-action-contexthelp.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.png cr32-action-about_kde.png crsc-action-reload_page.svgz cr16-action-connect_creating.png crsc-action-about_kde.svgz cr16-action-window_new.png crsc-mime-man.svgz crsc-action-add.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr64-mime-kivio_flw.png cr128-mime-karbon_karbon.png cr48-filesys-folder_important.png cr48-filesys-exec.png cr48-filesys-network_local.png cr48-mime-kword_kwd.png cr32-action-math_prod.png cr16-device-ipod_unmount.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr64-device-dvd_mount.png cr128-mime-recycled.png crsc-action-player_fwd.svgz cr32-mime-cdr.png cr22-action-mail_new.png cr32-mime-krita_kra.png cr22-device-compact_flash_unmount.png cr128-device-memory_stick_mount.png crsc-action-player_pause.svgz cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz cr64-filesys-folder_orange_open.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr32-action-view_fit_height.png cr22-action-colorpicker.png cr48-device-joystick.png crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr128-filesys-network_local.png cr32-action-make_kdevelop.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr32-mime-source_s.png cr16-filesys-folder_video.png crsc-mime-make.svgz cr64-filesys-folder_txt.png cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr48-filesys-folder_green.png cr22-action-color_fill.png cr48-filesys-folder_violet_open.png cr32-filesys-folder_favorite.png cr22-action-math_frac.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr32-action-fileimport.png cr22-mime-midi.png cr64-mime-core.png cr32-action-colorize.png cr22-action-filefind.png cr64-filesys-folder_locked.png cr32-action-view_tree.png cr64-device-hdd_mount.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png cr32-filesys-folder_grey_open.png cr32-action-math_matrix.png cr48-device-scanner.png cr128-mime-dvi.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png crsc-action-reload.svgz cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr128-mime-document2.png cr32-device-compact_flash_unmount.png cr32-action-indent.png cr16-action-bookmark.png crsc-mime-recycled.svgz cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr48-device-cdwriter_unmount.png cr16-action-kde5.png cr32-action-top.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr16-action-contents.png cr128-filesys-folder_favorite.png cr16-action-frame_spreadsheet.png cr22-mime-koffice.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png cr22-action-reload3.png crsc-device-blockdevice.svgz cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png cr16-action-tab_remove.png crsc-filesys-folder_man2.svgz cr48-mime-kugar_kud.png cr22-action-mouse.png cr22-mime-source_java.png crsc-app-kmenu.svgz crsc-mime-source_java.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr32-action-switchuser.png cr48-action-colorpicker.png cr48-mime-template_source.png crsc-action-view_fit_height.svgz crsc-action-text_bold.svgz cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr32-mime-cdimage.png cr16-filesys-desktop.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr64-filesys-folder_yellow.png cr32-action-finish.png cr32-mime-karbon_karbon.png cr16-action-1uparrow.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-action-player_rew.svgz crsc-filesys-folder_sound.svgz cr16-action-wizard.png cr128-filesys-file_broken.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr48-device-chardevice.png cr32-mime-vcard.png cr22-filesys-folder_print.png cr48-mime-source_s.png cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz crsc-action-exit.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png cr16-action-services.png crsc-mime-txt2.svgz cr22-action-mail_replylist.png cr64-device-mo_mount.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr64-mime-source_h.png cr22-mime-source_s.png cr32-action-player_fwd.png cr48-mime-log.png cr64-filesys-network_local.png cr22-action-rebuild.png cr32-device-print_class.png cr48-action-lock.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png crsc-action-fileclose.svgz cr32-action-view_fit_window.png cr16-device-print_class.png crsc-mime-source_c.svgz crsc-action-rotate_cw.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png crsc-device-mo_umount.svgz cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr32-device-joystick.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr128-device-compact_flash_mount.png cr32-action-view_icon.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr128-mime-widget_doc.png cr64-filesys-folder_yellow_open.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr32-action-connect_established.png cr16-action-fileimport.png cr128-filesys-folder_orange_open.png cr22-mime-file_locked.png cr16-mime-source_s.png cr16-mime-source_l.png cr22-action-bookmark_folder.png crsc-filesys-folder_important.svgz cr64-mime-source_j.png cr22-mime-kexi_kexi.png cr22-mime-source_c.png crsc-filesys-file_locked.svgz cr16-filesys-folder_home.png cr32-action-help.png crsc-device-joystick.svgz cr128-mime-ascii.png crsc-action-filenew.svgz cr22-app-password.png cr16-action-mail_send.png cr128-filesys-folder_important.png crsc-filesys-pipe.svgz cr48-mime-metafont.png cr22-action-gear.png cr48-action-filenew.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr64-device-ipod_mount.png cr32-action-view_right.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr48-mime-pdf.png cr32-action-contents2.png cr16-action-window_fullscreen.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr16-action-2leftarrow.png cr48-mime-kivio_flw.png cr48-device-dvd_mount.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png cr16-filesys-folder_orange.png cr32-mime-recycled.png cr48-action-remove.png crsc-filesys-folder_green_open.svgz cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-mime-mozilla_doc.png crsc-action-previous.svgz cr64-device-5floppy_unmount.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr32-filesys-network_local.png cr22-mime-netscape_doc.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr32-mime-zip.png cr128-app-kmenu.png cr48-device-camera_unmount.png cr128-filesys-lock_overlay.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr22-device-ipod_unmount.png cr32-mime-deb.png cr16-mime-quicktime.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_txt.png cr48-filesys-folder_home.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr48-filesys-folder_outbox.png cr32-mime-file_locked.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr16-device-pda_blue.png cr22-action-text_bold.png cr32-action-text_super.png cr32-device-compact_flash_mount.png cr22-action-remove.png crsc-mime-readme.svgz cr64-mime-source_f.png cr128-mime-source_o.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr48-action-forward.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr22-action-mail_post_to3.png cr64-filesys-folder_sound.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png crsc-mime-source_py.svgz cr16-action-view_tree.png cr16-action-view_fit_height.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr48-filesys-folder_orange_open.png cr22-action-mail_replyall.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr128-filesys-folder_image.png cr22-action-music_flat.png cr22-mime-message.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr64-filesys-folder_favorite.png cr48-mime-deb.png cr32-mime-source_java.png cr128-filesys-folder_locked.png cr22-action-music_natur.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr16-action-view_fit_window.png cr128-device-ipod_mount.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png crsc-action-share.svgz cr22-action-music_fullnote.png cr32-filesys-folder_important.png cr128-mime-krita_kra.png crsc-mime-cdr.svgz cr48-action-stop.png cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr22-action-previous.png cr16-action-colorpicker.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz crsc-action-player_eject.svgz cr32-action-view_text.png cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr48-device-hdd_mount.png cr32-action-text_center.png cr16-action-tab_breakoff.png cr48-mime-kpresenter_kpr.png cr32-action-mail_send.png cr48-action-add.png cr16-action-kde.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr64-mime-midi.png cr16-mime-kspread_ksp.png cr16-action-folder_new.png cr22-action-exit.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr32-filesys-folder_open.png cr64-mime-source_s.png cr16-action-ok.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr32-action-previous.png cr22-mime-karbon_karbon.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz crsc-mime-widget_doc.svgz cr22-mime-quicktime.png cr64-filesys-trashcan_full.png cr22-device-hdd_unmount.png crsc-mime-kexi_kexi.svgz cr64-filesys-folder_violet_open.png cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr32-mime-source_f.png cr16-action-contexthelp.png cr16-action-editshred.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr22-mime-vcard.png cr16-mime-widget_doc.png cr22-action-player_pause.png cr48-app-password.png cr128-filesys-pipe.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr16-action-tab_new_raised.png cr16-mime-kivio_flw.png cr48-mime-kspread_ksp.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png cr22-filesys-link_overlay.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr64-device-joystick.png cr48-filesys-folder_red_open.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr16-mime-dvi.png cr64-filesys-folder_home.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr32-action-show_side_panel.png cr128-filesys-folder_green_open.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png cr16-action-text_super.png crsc-filesys-folder.svgz cr16-action-locationbar_erase.png cr64-filesys-folder_open.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr48-device-ipod_mount.png cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr32-device-ipod_unmount.png cr22-mime-applix.png cr22-action-math_lsub.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr32-filesys-pipe.png cr22-action-back.png cr32-filesys-folder_orange.png cr64-device-memory.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr48-mime-netscape_doc.png cr22-action-reload.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr32-action-editdelete.png cr16-device-3floppy_unmount.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr16-action-filequickprint.png cr32-mime-empty.png cr128-device-print_class.png cr16-filesys-trashcan_empty.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-mime-tex.png cr32-action-filesave.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png crsc-filesys-folder_violet.svgz cr16-action-filter.png cr32-mime-font_truetype.png cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-music_fermatenote.png cr22-action-view_detailed.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-mime-resource.png cr32-action-text_sub.png cr16-action-music_natur.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr48-action-previous.png cr48-action-reload.png cr22-mime-source_moc.png cr16-mime-make.png cr22-action-1downarrow.png cr128-mime-cdr.png cr22-action-player_playlist.png cr48-device-mo_unmount.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr32-action-run.png cr64-mime-tgz.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr128-filesys-folder_grey.png cr32-mime-ascii.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr32-action-fileclose.png cr22-action-misc.png cr22-action-text_under.png crsc-action-player_stop.svgz cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png cr16-mime-txt.png crsc-filesys-folder_man.svgz cr16-action-player_pause.png cr16-action-player_stop.png cr22-device-smart_media_unmount.png cr128-mime-soffice.png cr22-action-rightjust.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-compfile.png cr22-action-inline_image.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-mime-rpm.png cr32-action-queue.png crsc-action-mail_get.svgz cr48-action-mail_new.png cr48-filesys-folder_red.png crsc-mime-quicktime.svgz cr48-action-rotate_cw.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png cr64-device-blockdevice.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr48-mime-shellscript.png cr128-mime-font_truetype.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr48-device-smart_media_unmount.png cr22-action-view_fit_window.png cr64-device-pda_black.png cr16-action-kde6.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png crsc-filesys-exec_wine.svgz cr32-action-mouse.png cr32-mime-postscript.png cr22-mime-kivio_flw.png cr32-device-memory.png cr16-app-kttsd.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr16-mime-source_o.png cr32-action-save_all.png cr48-action-reload_all_tabs.png cr16-filesys-server.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr16-device-blockdevice.png cr32-device-pda_blue.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr16-device-mo_mount.png cr22-action-player_end.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr16-mime-message.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr22-device-ipod_mount.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr22-action-editclear.png cr16-action-frameprint.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr64-mime-vectorgfx.png cr22-mime-recycled.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr32-action-button_ok.png cr48-filesys-folder_open.png cr32-action-attach.png crsc-action-rotate_ccw.svgz cr32-action-exec.png cr22-mime-txt2.png crsc-mime-netscape_doc.svgz cr22-action-redo.png cr64-filesys-folder_violet.png cr16-filesys-folder_red_open.png cr64-mime-source_o.png cr22-action-filesave.png cr48-mime-misc.png cr16-action-view_text.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png crsc-mime-html.svgz cr16-action-kde3.png cr22-action-revert.png cr128-filesys-folder_home.png cr16-device-compact_flash_mount.png cr32-action-compfile.png cr128-mime-info.png crsc-action-text_italic.svgz cr48-mime-exec_wine.png cr32-mime-source_y.png cr16-action-identity.png cr16-action-rotate_ccw.png cr32-device-nfs_unmount.png cr22-action-connect_no.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr22-action-toggle_log.png cr16-filesys-folder_violet.png cr22-action-math_onetwomatrix.png cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png crsc-mime-document.svgz cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr22-action-math_brackets.png cr32-mime-kword_kwd.png cr16-mime-ascii.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr32-device-tv.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png crsc-filesys-folder_tar.svgz cr32-action-mail_get.png cr128-mime-document.png cr64-device-3floppy_mount.png cr16-action-view_top_bottom.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png crsc-mime-source_pl.svgz cr22-filesys-folder_open.png cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png cr48-action-gohome.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr48-mime-tar.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr48-mime-widget_doc.png cr22-device-usbpendrive_mount.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr128-filesys-zip_overlay.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr128-mime-message.png cr22-action-today.png cr16-action-bottom.png cr64-mime-font.png cr32-filesys-folder_tar.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr16-mime-source_moc.png cr22-action-window_nofullscreen.png cr16-device-cdrom_mount.png cr48-mime-readme.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png crsc-action-stop.svgz crsc-action-remove.svgz cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png cr32-filesys-folder_sound.png crsc-action-contents2.svgz cr22-action-math_int.png cr128-filesys-folder_violet.png cr32-filesys-lock_overlay.png cr64-mime-source_l.png cr64-device-hdd_unmount.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-gf.png cr16-filesys-folder_print.png cr128-mime-source_p.png crsc-device-zip_mount.svgz cr32-mime-pk.png cr16-action-mail_post_to.png cr16-device-system.png cr64-mime-source_p.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr16-action-add.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr16-action-1leftarrow.png cr22-action-editshred.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr22-action-edittrash.png cr128-mime-spreadsheet.png cr32-action-unindent.png cr16-device-ipod_mount.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr16-device-mouse.png cr22-mime-encrypted.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr22-action-fileclose.png cr22-action-next.png cr32-mime-unknown.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-koffice.png cr48-mime-postscript.png cr16-action-player_rew.png cr16-action-stop.png cr16-action-fontsizedown.png cr32-action-filenew.png cr48-action-indent.png cr16-action-math_onetwomatrix.png cr16-action-connect_established.png cr16-action-editcut.png cr32-mime-font.png cr64-mime-karbon_karbon.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr22-mime-font_truetype.png cr16-action-music_flat.png cr48-device-camera_mount.png cr22-action-frame_image.png crsc-action-view_fit_width.svgz cr16-action-thumbnail.png cr32-mime-soffice.png crsc-action-up.svgz cr48-device-system.png cr48-mime-font_bitmap.png cr22-action-idea.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr16-action-player_playlist.png cr32-mime-core.png cr64-filesys-zip_overlay.png cr16-filesys-folder_open.png cr32-mime-source_cpp.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr16-action-mail_new.png cr48-mime-recycled.png cr32-action-view_fit_width.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-action-switchuser.png cr32-filesys-folder_man.png cr16-action-colorize.png cr22-mime-tex.png crsc-mime-tex.svgz cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr22-mime-font.png crsc-mime-postscript.svgz cr16-action-viewmagfit.png crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr32-action-spellcheck.png cr22-mime-kspread_ksp.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr64-mime-source_cpp.png cr64-device-ipod_unmount.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-mime-core.png cr128-device-hdd_mount.png cr64-device-5floppy_mount.png cr64-device-mo_unmount.png cr64-mime-info.png cr64-filesys-trashcan_empty.png cr64-filesys-lock_overlay.png cr22-action-editpaste.png cr32-action-text_italic.png cr22-action-folder.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-bookmark_folder.png cr16-action-project_open.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png crsc-filesys-zip_overlay.svgz cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr32-filesys-folder_red.png cr22-action-news_subscribe.png cr32-mime-source_h.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr48-mime-source_java.png cr16-action-transform.png cr128-mime-txt2.png cr16-action-viewmag-.png cr16-device-dvd_unmount.png cr32-mime-applix.png cr32-action-reload_page.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png crsc-mime-gf.svgz cr16-action-completion.png cr64-device-tablet.png cr22-device-3floppy_unmount.png cr32-device-ipod_mount.png cr64-mime-txt.png cr32-action-viewmag+.png cr16-device-memory.png cr48-mime-font_type1.png cr16-mime-kugar_kud.png cr48-device-printer1.png crsc-action-text_under.svgz cr32-action-undo.png cr16-filesys-pipe.png cr48-action-next.png cr32-filesys-folder_print.png cr16-mime-zip.png cr22-action-view_sidetree.png cr48-mime-empty.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png crsc-action-view_fit_window.svgz cr22-action-show_side_panel.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png crsc-action-top.svgz cr64-mime-metafont.png crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr22-action-math_prod.png cr128-mime-sound.png cr128-device-memory_stick_unmount.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr32-action-editclear.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr22-action-music_cleficon.png cr22-action-view_tree.png cr64-mime-font_bitmap.png cr48-mime-wordprocessing.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr128-action-launch.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr32-mime-quicktime.png cr64-filesys-folder_image.png cr16-mime-unknown.png cr32-device-smart_media_mount.png crsc-action-player_start.svgz cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png crsc-action-gohome.svgz cr128-mime-vectorgfx.png cr16-mime-gf.png cr32-action-kde.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-device-smart_media_unmount.png cr16-action-contents2.png cr22-filesys-folder_home.png cr22-mime-source.png cr16-filesys-link_overlay.png cr22-action-math_paren.png cr64-device-dvd_unmount.png cr48-device-5floppy_mount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr16-action-switchuser.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr48-device-compact_flash_unmount.png cr128-device-blockdevice.png
++KDE_DIST=cr32-device-system.png crsc-device-ipod_unmount.svgz cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png cr32-mime-template_source.png crsc-filesys-folder_favorite.svgz crsc-mime-zip.svgz cr16-action-about_kde.png cr32-action-mail_post_to.png cr48-action-rotate_ccw.png cr16-mime-tar.png cr64-mime-exec_wine.png cr16-device-hdd_mount.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr22-action-player_eject.png cr32-mime-exec_wine.png cr22-mime-tgz.png cr32-action-text_block.png crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png crsc-action-eraser.svgz cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr32-action-leftjust.png cr48-device-ipod_unmount.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr64-mime-html.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr64-device-smart_media_mount.png cr32-device-cdwriter_unmount.png cr48-mime-source_o.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-mime-encrypted.png cr48-action-frameprint.png cr32-mime-make.png cr22-action-thumbnail.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr16-mime-postscript.png cr32-filesys-desktop.png cr32-mime-pdf.png cr16-action-text.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr16-action-save_all.png cr64-mime-gf.png cr128-mime-metafont.png cr48-mime-txt.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr48-filesys-folder_violet.png cr128-mime-source.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png crsc-action-back.svgz cr22-mime-info.png cr32-action-bookmark_folder.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr22-action-mail_new3.png cr128-mime-source_f.png cr48-action-reload_page.png cr16-mime-misc.png cr16-action-player_play.png cr128-filesys-link_overlay.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png crsc-action-bottom.svgz cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-fileopen.png cr16-action-player_end.png cr64-mime-source_php.png cr48-mime-source_moc.png cr128-app-password.png cr22-action-make_kdevelop.png cr22-action-encrypted.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr64-action-player_play.png cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr48-action-filequickprint.png cr64-device-cdaudio_mount.png cr128-mime-pdf.png cr16-action-text_center.png cr22-action-pencil.png cr32-mime-tar.png crsc-action-finish.svgz cr64-mime-misc.png crsc-device-hdd_unmount.svgz cr128-mime-font.png cr16-action-eraser.png cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png crsc-action-down.svgz cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-filesys-zip_overlay.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-action-music_halfnote.png cr16-action-lock.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr16-action-remove.png cr22-action-view_choose.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png cr16-filesys-zip_overlay.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-action-text_bild.svgz crsc-filesys-folder_blue.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr128-mime-readme.png cr22-action-music_dottednote.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png crsc-mime-source_s.svgz cr32-mime-txt2.png cr22-action-mail_reply.png cr32-device-usbpendrive_mount.png cr16-mime-core.png cr128-mime-resource.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr16-filesys-lock_overlay.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png crsc-device-ipod_mount.svgz cr16-action-exit.png cr16-action-viewmag+.png cr32-device-blockdevice.png crsc-action-forward.svgz cr48-mime-man.png cr64-mime-source.png crsc-filesys-lock_overlay.svgz cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png cr32-action-exit.png crsc-mime-pk.svgz cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-action-reload.png cr16-mime-rpm.png cr64-mime-readme.png cr16-filesys-folder.png cr22-mime-rpm.png cr64-device-zip_mount.png cr48-app-kmenu.png crsc-app-kttsd.svgz cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr16-device-cdwriter_unmount.png cr22-action-halfencrypted.png cr22-action-switchuser.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr128-mime-exec_wine.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png crsc-action-text_super.svgz cr48-device-smart_media_mount.png crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr32-action-add.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr22-mime-kchart_chrt.png cr16-filesys-file_broken.png crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr16-action-charset.png cr22-filesys-folder_grey_open.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz crsc-filesys-folder_violet_open.svgz cr22-action-player_fwd.png cr16-device-memory_stick_mount.png cr16-action-edittrash.png cr16-action-rotate.png cr16-action-connect_no.png cr22-action-about_kde.png cr16-action-frame_query.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-kugar_kud.png cr32-action-math_paren.png cr32-mime-source.png cr32-action-math_rsub.png cr128-mime-source_j.png cr22-action-view_fit_width.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png cr16-mime-deb.png crsc-filesys-folder_txt.svgz cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr48-mime-karbon_karbon.png cr16-action-back.png crsc-mime-tgz.svgz cr128-filesys-folder_txt.png crsc-mime-log.svgz cr32-mime-kspread_ksp.png cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr32-action-player_pause.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png crsc-mime-file_temporary.svgz cr64-mime-font_truetype.png cr22-mime-readme.png cr32-action-gohome.png cr16-mime-source_py.png cr48-mime-source_cpp.png cr128-app-kttsd.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr16-action-view_icon.png cr22-action-top.png cr32-action-emptytrash.png cr16-device-mo_unmount.png cr22-action-signature.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-action-filesaveas.png cr32-mime-gettext.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-action-color_fill.png crsc-filesys-link_overlay.svgz cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr22-action-centrejust.png cr48-filesys-folder_html.png cr32-filesys-link_overlay.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr48-action-eraser.png cr64-mime-pk.png cr16-action-rotate_cw.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr22-action-view_fit_height.png cr32-action-contexthelp.png crsc-action-reload_all_tabs.svgz cr22-action-configure.png cr22-mime-vcalendar.png cr16-action-math_brace.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-binary.png cr16-mime-txt2.png cr16-mime-kchart_chrt.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr48-mime-midi.png cr64-device-cdwriter_mount.png cr32-mime-kformula_kfo.png cr48-mime-font.png cr64-device-system.png cr16-mime-font.png cr22-action-add.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr22-mime-document.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr32-action-connect_creating.png cr22-action-player_stop.png cr22-filesys-folder_red_open.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr64-filesys-link_overlay.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr16-action-find.png cr22-device-sd_mmc_unmount.png cr16-action-math_prod.png crsc-action-start.svgz cr32-action-wizard.png cr32-action-mail_reply.png cr64-device-mouse.png cr16-mime-source_h.png cr22-action-run.png cr128-filesys-folder_tar.png cr48-filesys-link_overlay.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr48-app-kttsd.png cr16-app-kmenu.png cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr128-filesys-network.png crsc-device-compact_flash_unmount.svgz cr32-action-view_bottom.png cr32-action-mail_find.png crsc-mime-message.svgz cr16-action-math_brackets.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr48-filesys-folder_green_open.png cr22-action-move.png cr48-mime-soffice.png cr16-action-no.png cr22-device-sd_mmc_mount.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.png crsc-action-reload_page.svgz cr32-action-about_kde.png cr16-action-connect_creating.png crsc-mime-man.svgz cr16-action-window_new.png crsc-action-about_kde.svgz cr22-filesys-www.png crsc-action-add.svgz cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.png cr32-action-math_prod.png cr48-mime-kword_kwd.png cr16-device-ipod_unmount.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr128-mime-recycled.png cr64-device-dvd_mount.png crsc-action-player_fwd.svgz cr22-action-mail_new.png cr32-mime-cdr.png cr22-device-compact_flash_unmount.png cr32-mime-krita_kra.png crsc-action-player_pause.svgz cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.png crsc-action-player_next.svgz cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr22-action-colorpicker.png cr32-action-view_fit_height.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr32-action-launch.png cr22-action-math_abs.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr16-mime-readme.png cr48-filesys-folder_tar.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr22-action-color_fill.png cr48-filesys-folder_green.png cr48-filesys-folder_violet_open.png cr22-action-math_frac.png cr32-filesys-folder_favorite.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr22-mime-midi.png cr32-action-fileimport.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.png cr64-device-hdd_mount.png cr32-action-view_tree.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png cr32-filesys-folder_grey_open.png cr48-device-scanner.png cr128-mime-dvi.png cr32-action-math_matrix.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png crsc-action-reload.svgz cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr32-device-compact_flash_unmount.png cr128-mime-document2.png cr32-action-indent.png crsc-mime-recycled.svgz cr16-action-bookmark.png cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr32-action-top.png cr16-action-kde5.png cr48-device-cdwriter_unmount.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr22-mime-koffice.png cr16-action-frame_spreadsheet.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png crsc-device-blockdevice.svgz cr22-action-reload3.png cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png crsc-filesys-folder_man2.svgz cr16-action-tab_remove.png cr48-mime-kugar_kud.png cr22-action-mouse.png crsc-app-kmenu.svgz cr22-mime-source_java.png crsc-mime-source_java.svgz crsc-action-launch.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr32-action-switchuser.png cr16-device-tablet.png cr48-mime-template_source.png cr48-action-colorpicker.png crsc-action-view_fit_height.svgz crsc-action-text_bold.svgz cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-app-kmenu.png cr32-action-text_left.png cr64-app-kmenu.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr32-filesys-zip_overlay.png cr16-action-tab_new.png cr48-action-rotate.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz crsc-action-player_rew.svgz cr128-filesys-file_broken.png cr16-action-wizard.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-device-chardevice.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png crsc-mime-txt2.svgz cr16-action-services.png cr64-device-mo_mount.png cr22-action-mail_replylist.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr32-action-player_fwd.png cr64-mime-source_h.png cr22-mime-source_s.png cr64-filesys-network_local.png cr48-mime-log.png cr22-action-rebuild.png cr48-action-lock.png cr32-device-print_class.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png crsc-action-fileclose.svgz cr16-device-print_class.png cr32-action-view_fit_window.png crsc-mime-source_c.svgz crsc-action-rotate_cw.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png cr16-action-redo.png crsc-device-mo_umount.svgz cr16-filesys-folder_outbox.png cr32-device-joystick.png cr22-action-fill.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr32-action-view_icon.png cr128-device-compact_flash_mount.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr64-filesys-folder_yellow_open.png cr128-mime-widget_doc.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr16-action-fileimport.png cr32-action-connect_established.png cr22-mime-file_locked.png cr128-filesys-folder_orange_open.png cr16-mime-source_s.png cr16-mime-source_l.png crsc-filesys-folder_important.svgz cr22-action-bookmark_folder.png cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr16-filesys-folder_home.png cr32-action-help.png crsc-filesys-file_locked.svgz crsc-device-joystick.svgz crsc-action-filenew.svgz cr128-mime-ascii.png cr22-app-password.png cr128-filesys-folder_important.png cr16-action-mail_send.png cr48-mime-metafont.png crsc-filesys-pipe.svgz cr48-action-filenew.png cr22-action-gear.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr16-action-kde4.png cr64-device-ipod_mount.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr16-action-window_fullscreen.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr48-device-dvd_mount.png cr48-mime-kivio_flw.png cr16-action-2leftarrow.png cr48-device-zip_mount.png cr32-action-revert.png cr22-action-player_play.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.png cr48-action-remove.png cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-device-5floppy_unmount.png cr64-mime-mozilla_doc.png crsc-action-previous.svgz cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr22-mime-netscape_doc.png cr32-filesys-network_local.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-action-misc.png cr48-mime-source_p.png cr128-app-kmenu.png crsc-mime-source_h.svgz cr32-mime-zip.png cr48-device-camera_unmount.png cr16-mime-resource.png cr128-filesys-lock_overlay.png cr16-action-editpaste.png cr32-action-misc.png cr22-device-ipod_unmount.png cr22-action-fileexport.png cr16-mime-quicktime.png cr32-mime-deb.png cr64-mime-source_java.png cr48-filesys-folder_home.png cr48-filesys-folder_txt.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr22-action-text_bold.png cr16-device-pda_blue.png cr32-action-text_super.png crsc-mime-readme.svgz cr128-mime-source_o.png cr64-mime-source_f.png cr22-action-remove.png cr32-device-compact_flash_mount.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr128-device-printer1.png cr22-filesys-folder_orange.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-action-colorpicker.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr64-filesys-folder_sound.png cr22-action-mail_post_to3.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr16-action-view_fit_height.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr22-action-mail_replyall.png cr48-filesys-folder_orange_open.png cr32-device-cdaudio_mount.png crsc-action-next.svgz cr22-mime-message.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr64-device-cdrom_mount.png cr64-mime-applix.png crsc-action-rotate.svgz cr48-mime-deb.png cr32-mime-source_java.png cr64-filesys-folder_favorite.png cr22-action-music_natur.png cr128-filesys-folder_locked.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr16-action-view_fit_window.png cr128-device-ipod_mount.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz crsc-mime-cdr.svgz cr32-filesys-folder_important.png cr128-mime-krita_kra.png cr16-action-inline_image.png cr48-action-stop.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr16-action-colorpicker.png cr22-action-previous.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png crsc-action-player_eject.svgz cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr32-action-text_center.png cr48-device-hdd_mount.png cr48-mime-kpresenter_kpr.png cr16-action-tab_breakoff.png cr32-action-mail_send.png cr48-action-add.png cr16-action-kde.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr16-mime-kspread_ksp.png cr64-mime-midi.png cr22-action-exit.png cr16-action-folder_new.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr22-mime-karbon_karbon.png cr32-action-previous.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz cr22-mime-quicktime.png crsc-mime-widget_doc.svgz cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.png cr64-filesys-folder_violet_open.png crsc-mime-kexi_kexi.svgz cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr16-action-contexthelp.png cr16-action-editshred.png cr32-mime-source_f.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.png crsc-mime-font_type1.svgz cr128-filesys-folder_html.png crsc-device-nfs_unmount.svgz cr22-action-contents2.png crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr22-app-kttsd.png cr64-filesys-pipe.png cr22-action-view_text.png cr48-mime-kspread_ksp.png cr16-mime-kivio_flw.png cr16-action-tab_new_raised.png cr16-mime-empty.png cr64-mime-image.png cr64-mime-spreadsheet.png crsc-device-3floppy_mount.svgz cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png cr22-filesys-link_overlay.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr48-filesys-folder_red_open.png cr64-device-joystick.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png crsc-action-switchuser.svgz cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-action-show_side_panel.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png crsc-filesys-folder.svgz cr16-action-text_super.png cr64-filesys-folder_open.png cr16-action-locationbar_erase.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr48-device-ipod_mount.png cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr32-device-ipod_unmount.png cr22-action-math_lsub.png cr22-mime-applix.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz cr22-app-kmenu.png crsc-device-smartmedia_unmount.svgz cr64-device-memory.png cr32-filesys-folder_orange.png cr22-action-back.png cr32-filesys-pipe.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png crsc-device-system.svgz cr22-action-view_bottom.png cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr22-action-reload.png cr48-mime-netscape_doc.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-action-charset.png cr32-mime-source_p.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr16-device-3floppy_unmount.png cr32-action-editdelete.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr32-mime-empty.png cr16-action-filequickprint.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-action-filesave.png cr32-mime-tex.png cr32-filesys-folder_home2.png cr64-app-kttsd.png cr48-mime-vcard.png cr48-mime-pk.png cr16-action-filter.png cr32-mime-font_truetype.png crsc-filesys-folder_violet.svgz cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-view_detailed.png cr22-action-music_fermatenote.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-action-text_sub.png cr16-action-music_natur.png cr32-mime-resource.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr48-action-previous.png cr48-action-reload.png cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr128-mime-cdr.png cr48-device-mo_unmount.png cr22-action-player_playlist.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr64-mime-tgz.png cr32-action-run.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr32-action-eraser.png cr16-filesys-trashcan_full.png cr32-mime-ascii.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz crsc-action-player_stop.svgz cr22-action-misc.png cr32-action-fileclose.png cr22-action-text_under.png cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png crsc-filesys-folder_man.svgz cr16-mime-txt.png cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr22-action-rightjust.png cr128-mime-soffice.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-inline_image.png cr22-action-compfile.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr16-action-show_side_panel.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-action-queue.png cr32-mime-rpm.png crsc-action-mail_get.svgz cr48-action-mail_new.png crsc-mime-quicktime.svgz cr48-filesys-folder_red.png cr48-action-rotate_cw.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr64-device-blockdevice.png cr128-mime-font_truetype.png cr48-mime-shellscript.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr48-device-smart_media_unmount.png cr22-action-view_fit_window.png cr64-device-pda_black.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr128-device-ipod_unmount.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png cr32-action-mouse.png crsc-filesys-exec_wine.svgz cr32-mime-postscript.png cr32-device-memory.png cr22-mime-kivio_flw.png cr16-app-kttsd.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr32-action-save_all.png cr16-mime-source_o.png cr16-filesys-server.png cr48-action-reload_all_tabs.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr32-device-pda_blue.png cr16-device-blockdevice.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png cr16-device-mo_mount.png cr22-action-player_end.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png cr16-mime-message.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr22-device-ipod_mount.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr16-action-frameprint.png cr22-action-editclear.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr22-mime-recycled.png cr64-mime-vectorgfx.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr48-action-kde.png cr32-action-music_natur.png cr32-action-remove.png cr48-filesys-lock_overlay.png cr22-action-frame_spreadsheet.png cr48-filesys-folder_open.png cr32-action-button_ok.png crsc-action-rotate_ccw.svgz cr32-action-attach.png cr32-action-exec.png crsc-mime-netscape_doc.svgz cr22-mime-txt2.png cr22-action-redo.png cr64-filesys-folder_violet.png cr64-mime-source_o.png cr16-filesys-folder_red_open.png cr48-mime-misc.png cr22-action-filesave.png cr16-action-view_text.png cr22-action-mail_forward.png cr64-mime-binary.png cr48-filesys-zip_overlay.png crsc-mime-html.svgz cr16-action-kde3.png cr16-device-compact_flash_mount.png cr128-filesys-folder_home.png cr22-action-revert.png cr32-action-compfile.png crsc-action-text_italic.svgz cr128-mime-info.png cr48-mime-exec_wine.png cr16-action-identity.png cr32-mime-source_y.png cr16-action-rotate_ccw.png cr22-action-connect_no.png cr32-device-nfs_unmount.png cr32-app-kttsd.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-player_start.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png cr64-mime-message.png crsc-mime-document.svgz cr16-action-decrypted.png cr22-action-identity.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr32-mime-kword_kwd.png cr22-action-math_brackets.png cr16-mime-ascii.png cr22-action-math_sum.png crsc-action-colorpicker.svgz cr32-action-start.png cr128-mime-font_bitmap.png cr32-device-tv.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png cr32-action-mail_get.png crsc-filesys-folder_tar.svgz cr128-mime-document.png cr16-action-view_top_bottom.png cr64-device-3floppy_mount.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr22-filesys-folder_open.png crsc-mime-source_pl.svgz cr64-filesys-www.png crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr48-action-gohome.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr128-device-sd_mmc_unmount.png cr48-mime-tar.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr128-filesys-zip_overlay.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-filesys-folder_man.png cr16-action-stamp.png cr22-action-text_super.png cr32-action-folder_new.png cr16-action-mail_find.png cr128-mime-message.png cr22-action-today.png cr64-mime-kugar_kud.png cr16-action-bottom.png cr22-action-button_ok.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr48-mime-readme.png cr16-mime-source_moc.png cr16-device-cdrom_mount.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png crsc-action-stop.svgz cr16-action-pencil.png crsc-action-remove.svgz cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr22-action-math_int.png cr128-filesys-folder_violet.png cr32-filesys-lock_overlay.png cr64-device-hdd_unmount.png cr64-mime-source_l.png cr32-mime-readme.png cr48-action-launch.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr128-mime-gf.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-source_p.png cr16-filesys-folder_print.png crsc-device-zip_mount.svgz cr32-mime-pk.png cr16-action-mail_post_to.png cr64-mime-source_p.png cr16-device-system.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr16-action-add.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr22-action-editshred.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr128-mime-spreadsheet.png cr22-action-edittrash.png cr32-action-unindent.png cr16-device-ipod_mount.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr22-mime-encrypted.png cr16-device-mouse.png cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-next.png cr22-action-fileclose.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-connect_established.png cr16-action-math_onetwomatrix.png cr16-action-editcut.png cr64-mime-karbon_karbon.png cr32-mime-font.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr32-action-view_remove.png cr16-action-text_italic.png cr16-mime-document.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr16-action-music_flat.png cr22-mime-font_truetype.png cr48-device-camera_mount.png cr22-action-frame_image.png crsc-action-view_fit_width.svgz cr16-action-thumbnail.png cr32-mime-soffice.png crsc-action-up.svgz cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr32-mime-vectorgfx.png cr48-filesys-trashcan_full.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr16-action-player_playlist.png cr32-mime-core.png cr32-mime-source_cpp.png cr16-filesys-folder_open.png cr64-filesys-zip_overlay.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr48-mime-recycled.png cr16-action-mail_new.png cr32-action-view_fit_width.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-action-switchuser.png cr32-filesys-folder_man.png cr16-action-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr22-mime-font.png crsc-mime-postscript.svgz crsc-mime-core.svgz cr16-action-viewmagfit.png cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr32-action-music_quarternote.png cr128-filesys-trashcan_empty.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr64-device-ipod_unmount.png cr64-mime-source_cpp.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-device-hdd_mount.png cr128-mime-core.png cr64-device-5floppy_mount.png cr64-filesys-trashcan_empty.png cr64-mime-info.png cr64-device-mo_unmount.png cr64-filesys-lock_overlay.png cr22-action-editpaste.png cr22-action-folder.png cr32-action-text_italic.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-project_open.png cr16-action-bookmark_folder.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr16-action-view_fit_width.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png crsc-filesys-zip_overlay.svgz cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr22-action-news_subscribe.png cr32-filesys-folder_red.png cr32-mime-source_h.png cr48-mime-source_java.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-mime-applix.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png cr16-action-completion.png crsc-mime-gf.svgz cr64-device-tablet.png cr22-device-3floppy_unmount.png cr32-device-ipod_mount.png cr64-mime-txt.png cr16-device-memory.png cr32-action-viewmag+.png cr48-mime-font_type1.png cr48-device-printer1.png cr16-mime-kugar_kud.png cr16-filesys-pipe.png crsc-action-text_under.svgz cr32-action-undo.png cr32-filesys-folder_print.png cr16-mime-zip.png cr48-action-next.png cr48-mime-empty.png cr22-action-view_sidetree.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png crsc-action-view_fit_window.svgz cr22-action-show_side_panel.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png crsc-action-top.svgz crsc-action-player_play.svgz cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr128-mime-sound.png cr22-action-math_prod.png cr128-device-memory_stick_unmount.png cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-action-music_cleficon.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-mime-source_cpp.png cr48-mime-wordprocessing.png cr64-mime-font_bitmap.png cr22-action-view_tree.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr128-action-launch.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr64-filesys-folder_image.png cr32-mime-quicktime.png cr16-mime-unknown.png cr32-device-smart_media_mount.png crsc-action-player_start.svgz cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png crsc-action-gohome.svgz cr128-mime-vectorgfx.png cr16-mime-gf.png cr32-action-kde.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-action-contents2.png cr16-device-smart_media_unmount.png cr22-filesys-folder_home.png cr16-filesys-link_overlay.png cr22-mime-source.png cr48-device-5floppy_mount.png cr22-action-math_paren.png cr64-device-dvd_unmount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-switchuser.png cr16-action-compfile.png cr32-mime-kmultiple.png cr128-device-blockdevice.png cr48-device-compact_flash_unmount.png
#>+ 2
docs-am:
- #>+ 3875
+ #>+ 3879
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
@@ -64334,7 +32528,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-karbon_karbon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ $(INSTALL_DATA) $(srcdir)/cr128-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
@@ -64466,6 +32659,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+ $(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
@@ -64567,7 +32761,6 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
- $(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
@@ -64877,6 +33070,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-airbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
+ $(INSTALL_DATA) $(srcdir)/cr64-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
@@ -65013,70 +33207,14 @@
- $(INSTALL_DATA) $(srcdir)/cr48-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/tex.png
- $(INSTALL_DATA) $(srcdir)/cr16-device-cdrom_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_mount.png
- $(INSTALL_DATA) $(srcdir)/cr16-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/unknown.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/rpm.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_frac.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filefind.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_yellow.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-rotate_cw.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_cw.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fermatenote.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tab_breakoff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
- $(INSTALL_DATA) $(srcdir)/crsc-filesys-link_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-filesys-link_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
- $(INSTALL_DATA) $(srcdir)/cr128-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/printer1.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-view_text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_text.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/previous.png
- $(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_man.png
- $(INSTALL_DATA) $(srcdir)/cr64-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-mozilla_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-start.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_html.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kmultiple.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/binary.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-about_kde.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/about_kde.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-action-centrejust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-edittrash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edittrash.png
@@ -65086,53 +33224,7 @@
- $(INSTALL_DATA) $(srcdir)/cr128-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
- $(INSTALL_DATA) $(srcdir)/cr22-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
- $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-device-sd_mmc_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_mount.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_tar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-shellscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_fwd.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/core.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_page.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-deb.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/eraser.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/template_source.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-zip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/system.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-action-messagebox_critical.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_critical.png
- $(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_green.png
- $(INSTALL_DATA) $(srcdir)/cr16-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_unmount.png
@@ -65156,16 +33248,7 @@
- $(INSTALL_DATA) $(srcdir)/cr128-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
- $(INSTALL_DATA) $(srcdir)/crsc-mime-log.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/log.svgz
- $(INSTALL_DATA) $(srcdir)/cr128-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_s.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-reload3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/link_overlay.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/log.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-gear.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gear.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-project_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/project_open.png
- $(INSTALL_DATA) $(srcdir)/cr16-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/exec.png
@@ -65178,7 +33261,17 @@
- $(INSTALL_DATA) $(srcdir)/cr16-action-fileprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileprint.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_stop.png
- $(INSTALL_DATA) $(srcdir)/cr128-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document2.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/krita_kra.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-lock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-rpm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/rpm.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-man.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
++ $(INSTALL_DATA) $(srcdir)/cr22-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-math_lsub.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_int.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
- $(INSTALL_DATA) $(srcdir)/cr64-device-compact_flash_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_unmount.png
- $(INSTALL_DATA) $(srcdir)/cr64-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_unmount.png
@@ -65211,7 +33304,13 @@
- $(INSTALL_DATA) $(srcdir)/cr64-mime-pdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pdf.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-unlock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/unlock.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde5.png
-- $(INSTALL_DATA) $(srcdir)/cr64-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdtrack.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-dvd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-colorscm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/colorscm.png
+ $(INSTALL_DATA) $(srcdir)/cr64-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/ipod_mount.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_new.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-shellscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-next.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/next.svgz
@@ -65225,81 +33324,16 @@
- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-music_eightnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
- $(INSTALL_DATA) $(srcdir)/cr16-mime-source_l.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
-- $(INSTALL_DATA) $(srcdir)/cr32-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-document.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
- $(INSTALL_DATA) $(srcdir)/cr128-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt2.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_sixteenthnote.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_bitmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vectorgfx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_new.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/zip.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_html.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-tab_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-file_broken.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_broken.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-device-joystick.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-device-ipod_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_black.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
- $(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
+- $(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
- $(INSTALL_DATA) $(srcdir)/cr64-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-frameprint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-action-rotate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-music_halfnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-contexthelp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_stop.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/soffice.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_height.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_height.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/widget_doc.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag-.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_inbox.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag1.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_side_panel.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/wizard.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/file_broken.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mouse.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/wordprocessing.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kword_kwd.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tar.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/log.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_pause.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_abs.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-kdevelop_down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kdevelop_down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
- $(INSTALL_DATA) $(srcdir)/cr32-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
- $(INSTALL_DATA) $(srcdir)/cr64-mime-midi.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
- $(INSTALL_DATA) $(srcdir)/cr16-device-hdd_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
@@ -65339,7 +33373,34 @@
- $(INSTALL_DATA) $(srcdir)/cr32-action-math_prod.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
- $(INSTALL_DATA) $(srcdir)/cr22-mime-koffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
-- $(INSTALL_DATA) $(srcdir)/cr22-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
++ $(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_violet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-action-reload_all_tabs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-folder_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder_new.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-math_frac.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_frac.png
++ $(INSTALL_DATA) $(srcdir)/cr64-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-find.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
++ $(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-filefind.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filefind.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_yellow.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-rotate_cw.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate_cw.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-music_fermatenote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_fermatenote.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tab_breakoff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-link_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/link_overlay.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-mozilla_doc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-start.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-help.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
++ $(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr48-device-cdrom_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr22-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
- $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_image.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
- $(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
@@ -65348,55 +33409,43 @@
- $(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-source_php.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
- $(INSTALL_DATA) $(srcdir)/cr16-filesys-lock_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-cdwriter_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-make_kdevelop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contents.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
++ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_orange.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_html.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kmultiple.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-binary.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/binary.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/tgz.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_bold.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
++ $(INSTALL_DATA) $(srcdir)/cr64-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-top.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
++ $(INSTALL_DATA) $(srcdir)/cr32-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-start.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-dvi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-desktop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
++ $(INSTALL_DATA) $(srcdir)/crsc-device-sd_mmc_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_mount.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/zip.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
++ $(INSTALL_DATA) $(srcdir)/cr48-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdaudio_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_tar.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-shellscript.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-action-compfile.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-viewmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-math_lsup.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-source_c.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_window.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-flag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/flag.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/misc.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kivio_flw.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-wizard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-info.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-stamp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-device-system.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tex.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
+- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-rotate_ccw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-mime-source_java.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-frame_chart.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
- $(INSTALL_DATA) $(srcdir)/cr48-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
+- $(INSTALL_DATA) $(srcdir)/cr48-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
- $(INSTALL_DATA) $(srcdir)/cr64-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
- $(INSTALL_DATA) $(srcdir)/crsc-filesys-file_important.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
@@ -65421,7 +33470,38 @@
- $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
-- $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
++ $(INSTALL_DATA) $(srcdir)/cr128-device-hdd_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-text.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-encrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-vcard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcard.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_fwd.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/core.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-reload_page.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload_page.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-configure.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-edit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-file_locked.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-deb.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-action-mail_get.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/template_source.png
++ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-zip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt.png
++ $(INSTALL_DATA) $(srcdir)/cr16-device-system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/system.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-text_sub.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue_open.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue_open.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_tree.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-reload3.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
++ $(INSTALL_DATA) $(srcdir)/cr48-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/link_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_red_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
- $(INSTALL_DATA) $(srcdir)/cr22-mime-message.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-math_int.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
- $(INSTALL_DATA) $(srcdir)/cr32-device-ipod_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
@@ -65432,13 +33512,7 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
- $(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-device-dvd_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-eraser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
+- $(INSTALL_DATA) $(srcdir)/cr22-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-folder.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-deb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
- $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
@@ -65447,9 +33521,73 @@
- $(INSTALL_DATA) $(srcdir)/cr32-mime-krita_kra.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-music_flat.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
-- $(INSTALL_DATA) $(srcdir)/cr64-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/log.png
++ $(INSTALL_DATA) $(srcdir)/cr128-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/compact_flash_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-window_fullscreen.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_fullscreen.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-blend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/blend.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-txt2.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/txt2.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_sixteenthnote.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-camera_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-bookmark_toolbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_bitmap.png
++ $(INSTALL_DATA) $(srcdir)/cr64-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/pda_black.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-vectorgfx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vectorgfx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-mail_new.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_new.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-zip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/zip.png
++ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_html.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-tab_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-file_broken.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_broken.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-device-joystick.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-device-ipod_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_unmount.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-pda_black.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_black.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-template_source.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-image.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
++ $(INSTALL_DATA) $(srcdir)/cr22-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-kmultiple.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-html.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
++ $(INSTALL_DATA) $(srcdir)/cr128-device-ipod_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr22-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-player_stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_stop.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-undo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/soffice.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
++ $(INSTALL_DATA) $(srcdir)/cr128-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-filesys-zip_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-frame_spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
++ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_height.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_height.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/widget_doc.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_man2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man2.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag-.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag-.png
++ $(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_inbox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_inbox.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag1.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag1.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_side_panel.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-wizard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/wizard.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-source_py.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-file_broken.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/file_broken.png
++ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_grey.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-queue.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
++ $(INSTALL_DATA) $(srcdir)/cr64-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mouse.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/wordprocessing.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kword_kwd.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tar.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/log.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
- $(INSTALL_DATA) $(srcdir)/cr32-mime-soffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
- $(INSTALL_DATA) $(srcdir)/cr32-filesys-network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
@@ -65465,7 +33603,11 @@
- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-action-mail_delete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-text_strike.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-player_pause.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_pause.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-math_abs.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_abs.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-text_right.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
- $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
- $(INSTALL_DATA) $(srcdir)/crsc-mime-wordprocessing.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-mime-document2.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
@@ -65474,6 +33616,74 @@
- $(INSTALL_DATA) $(srcdir)/crsc-mime-soffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-action-editcopy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-mail_post_to.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
+- $(INSTALL_DATA) $(srcdir)/cr64-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
+- $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-text_super.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
+- $(INSTALL_DATA) $(srcdir)/cr16-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
+- $(INSTALL_DATA) $(srcdir)/cr48-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
+- $(INSTALL_DATA) $(srcdir)/cr64-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
++ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_favorite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kdevelop_down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-source_c.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-music_sixteenthnote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
++ $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_blue.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-view_fit_window.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/view_fit_window.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-mail_replylist.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-showmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
+- $(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-locationbar_erase.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-text_bold.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-flag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/flag.png
++ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-misc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/misc.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kivio_flw.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-button_ok.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-usbpendrive_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-wizard.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-info.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
++ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
++ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-stamp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
++ $(INSTALL_DATA) $(srcdir)/crsc-device-system.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-action-share.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/share.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-scanner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tex.png
++ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_violet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-kugar_kud.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-view_fit_height.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-eraser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
++ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-editclear.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-password.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-kpresenter_kpr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
++ $(INSTALL_DATA) $(srcdir)/crsc-mime-source_java.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-frame_chart.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-show_side_panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
++ $(INSTALL_DATA) $(srcdir)/cr48-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-colorpicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-readme.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
++ $(INSTALL_DATA) $(srcdir)/crsc-device-dvd_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-eraser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-make.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-mail_generic.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
+ $(INSTALL_DATA) $(srcdir)/cr32-device-sd_mmc_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
@@ -65482,7 +33692,44 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-device-ipod_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_important.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_important.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-font_truetype.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font_truetype.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
+- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
+- $(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
+- $(INSTALL_DATA) $(srcdir)/cr48-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
+- $(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
+- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_print.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
+- $(INSTALL_DATA) $(srcdir)/cr128-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
+- $(INSTALL_DATA) $(srcdir)/crsc-filesys-home_white.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
+- $(INSTALL_DATA) $(srcdir)/cr64-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
+- $(INSTALL_DATA) $(srcdir)/cr48-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
+- $(INSTALL_DATA) $(srcdir)/cr16-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+- $(INSTALL_DATA) $(srcdir)/crsc-device-camera_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
+- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-action-player_volume.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
+- $(INSTALL_DATA) $(srcdir)/cr16-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
+- $(INSTALL_DATA) $(srcdir)/crsc-mime-ascii.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
+- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
+- $(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
+- $(INSTALL_DATA) $(srcdir)/cr64-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
+- $(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
+- $(INSTALL_DATA) $(srcdir)/cr64-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
+- $(INSTALL_DATA) $(srcdir)/cr16-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
+ $(INSTALL_DATA) $(srcdir)/cr16-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/blockdevice.png
+ $(INSTALL_DATA) $(srcdir)/cr22-mime-source_pl.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
@@ -65494,18 +33741,14 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-source_f.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
+ $(INSTALL_DATA) $(srcdir)/cr32-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
- $(INSTALL_DATA) $(srcdir)/cr32-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
-- $(INSTALL_DATA) $(srcdir)/cr64-device-chardevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-halfencrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
-- $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-exec_wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
+ $(INSTALL_DATA) $(srcdir)/cr128-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
+ $(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-txt2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-mime-source_cpp.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-tgz.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-player_eject.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-action-text_super.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-action-text_super.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+ $(INSTALL_DATA) $(srcdir)/cr16-device-printer1.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
+ $(INSTALL_DATA) $(srcdir)/cr64-device-nfs_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
@@ -65546,53 +33789,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_h.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-info.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-player_rew.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-view_tree.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
-- $(INSTALL_DATA) $(srcdir)/cr16-device-memory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
-- $(INSTALL_DATA) $(srcdir)/cr48-mime-cdtrack.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
-- $(INSTALL_DATA) $(srcdir)/cr64-device-camera_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-attach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-showmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
-- $(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
-- $(INSTALL_DATA) $(srcdir)/cr64-mime-cdimage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
-- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-viewmag+.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
-- $(INSTALL_DATA) $(srcdir)/cr22-device-memory_stick_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-player_playlist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
-- $(INSTALL_DATA) $(srcdir)/cr48-mime-mozilla_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
-- $(INSTALL_DATA) $(srcdir)/cr16-device-cdaudio_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
-- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_print.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
-- $(INSTALL_DATA) $(srcdir)/cr128-mime-txt.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
-- $(INSTALL_DATA) $(srcdir)/cr32-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
-- $(INSTALL_DATA) $(srcdir)/crsc-filesys-home_white.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
-- $(INSTALL_DATA) $(srcdir)/cr48-device-sd_mmc_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
-- $(INSTALL_DATA) $(srcdir)/cr64-mime-source_java.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-paintbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
-- $(INSTALL_DATA) $(srcdir)/cr48-device-mouse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-decrypted.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
-- $(INSTALL_DATA) $(srcdir)/cr16-mime-video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
-- $(INSTALL_DATA) $(srcdir)/crsc-device-camera_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-action-text_under.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
-- $(INSTALL_DATA) $(srcdir)/crsc-filesys-folder_locked.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-action-player_volume.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
-- $(INSTALL_DATA) $(srcdir)/cr16-mime-postscript.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
-- $(INSTALL_DATA) $(srcdir)/crsc-mime-ascii.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-mime-kexi_kexi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
-- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_home2.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
-- $(INSTALL_DATA) $(srcdir)/cr22-device-3floppy_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-leftjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-identity.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
-- $(INSTALL_DATA) $(srcdir)/cr64-device-blockdevice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
-- $(INSTALL_DATA) $(srcdir)/crsc-device-cdaudio_unmount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
-- $(INSTALL_DATA) $(srcdir)/cr64-mime-resource.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
-- $(INSTALL_DATA) $(srcdir)/cr16-mime-quicktime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
-- $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_tar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-move.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-music_cross.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kivio_flw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
+ $(INSTALL_DATA) $(srcdir)/cr48-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_j.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
@@ -65619,9 +33816,9 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
@@ -65917,6 +34114,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+ $(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-resource.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
@@ -65968,8 +34166,8 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-1rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+ $(INSTALL_DATA) $(srcdir)/cr128-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
@@ -66632,7 +34830,6 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
@@ -66684,6 +34881,8 @@
- $(INSTALL_DATA) $(srcdir)/cr128-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-launch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-launch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-next.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
-
-uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
@@ -67493,6 +35692,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+ $(INSTALL_DATA) $(srcdir)/cr16-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
+ $(INSTALL_DATA) $(srcdir)/cr48-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
@@ -67588,6 +35788,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-action-connect_established.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_sum.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-filesaveas.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-previous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-player_fwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-link_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
+ $(INSTALL_DATA) $(srcdir)/cr22-filesys-www.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
@@ -68342,7 +36543,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
@@ -68413,6 +36613,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
@@ -68489,7 +36690,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
@@ -68785,6 +36985,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
@@ -68915,6 +37116,25 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_l.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_all_tabs.png
@@ -68937,12 +37157,47 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileclose.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/help.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_unmount.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
@@ -68957,6 +37212,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/man.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/top.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/exec.png
@@ -68973,7 +37229,9 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_tar.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/shellscript.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesaveas.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
@@ -69034,13 +37292,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/frameprint.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_halfnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contexthelp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_pl.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kmultiple.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
@@ -69083,7 +37335,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kdevelop_down.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_c.svgz
@@ -69108,7 +37360,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
@@ -69120,7 +37371,8 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_fit_height.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editclear.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/password.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
@@ -69128,15 +37380,84 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_chart.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_side_panel.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/paintbrush.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorpicker.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/unindent.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/eraser.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_generic.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
@@ -69156,20 +37477,19 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/save_all.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/midi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/hdd_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/5floppy_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editshred.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/kexi_kexi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_cpp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_eject.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
@@ -69185,22 +37505,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_eject.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/encrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/toggle_log.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/start.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/pda_black.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/contents2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vectorgfx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmarks_list_add.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/help.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/pk.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/tex.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/back.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gohome.png
@@ -69225,13 +37530,66 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kivio_flw.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_j.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_sound.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
@@ -69243,15 +37601,11 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/forward.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
@@ -69261,7 +37615,97 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/wordprocessing.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
@@ -69270,7 +37714,11 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/identity.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcalendar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replyall.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_y.png
@@ -69284,49 +37732,101 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_fermatenote.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/start.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcut.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/trashcan_empty.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/joystick.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesave.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_php.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_empty.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/3floppy_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_dottednote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/previous.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_onetwomatrix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_prod.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/koffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/spreadsheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_favorite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_get.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_php.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/lock_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/compfile.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsup.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_txt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_ccw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/smart_media_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_stop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_pl.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
@@ -69359,7 +37859,21 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_super.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
@@ -69372,33 +37886,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
@@ -69410,28 +37898,25 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_top_bottom.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/www.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_c.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/deb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
@@ -69506,7 +37991,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/make.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_o.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/krita_kra.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tablet.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
@@ -69531,9 +38016,9 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_p.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdrom_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow_open.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/history.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_eightnote.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
@@ -69571,73 +38056,11 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/player_playlist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_flat.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/spreadsheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_truetype.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/mozilla_doc.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_text.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsup.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_delete.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_strike.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileclose.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/wordprocessing.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/document2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/info.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/quicktime.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editcopy.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_post_to.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/exec_wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/chardevice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/halfencrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_yellow_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_super.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cross.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_tree.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/cdtrack.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/attach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/showmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdimage.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frameprint.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag+.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/memory_stick_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdaudio_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_print.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_f.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/home_white.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/sd_mmc_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_java.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filesaveas.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/decrypted.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag1.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/camera_mount.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/video.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
@@ -69652,237 +38075,14 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/tgz.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_duplicate.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_volume.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/postscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/ascii.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kexi_kexi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_home2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/rotate_cw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/3floppy_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/leftjust.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/identity.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/blockdevice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdaudio_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/resource.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_under.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/soffice.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_tar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/move.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_man.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_blue.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/desktop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_c.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/stop.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sum.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/pencil.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gohome.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/metafont.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_important.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/find.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_get.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/quicktime.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kchart_chrt.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_moc.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/switchuser.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1leftarrow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/postscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/colorscm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate_ccw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/cdwriter_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/info.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/openterm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_fullscreen.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/hdd_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_left.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/smart_media_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/colorpicker.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/zip_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/launch.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_new3.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdrom_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/empty.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_bitmap.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_brace.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_no.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_green_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_remove.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/folder_new.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/news.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/top.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editclear.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/message_reply.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1downarrow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/pipe.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tgz.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sqrt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/undo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_home2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_strike.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/revert.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_get.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/next.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/cdaudio_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/stop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_sub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/readme.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_edit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_o.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/filesave.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_locked.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/resource.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/ftp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/bottom.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_pl.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_brackets.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/configure.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_matrix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_truetype.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_lsub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/html.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_spreadsheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/www.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kspread_ksp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/krita_kra.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_natur.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/dvd_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/remove.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fork.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_txt.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/tablet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcut.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileprint.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/misc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/readme.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_under.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_start.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/karbon_karbon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/reload.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_right.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_italic.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdtrack.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/usbpendrive_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kexi_kexi.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/document2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/postscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/link_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/make.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_h.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/halfencrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/exec_wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/ipod_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kugar_kud.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_reply.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/misc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_established.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/emptytrash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_favorite.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/video.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/shellscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/goto.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_py.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_prod.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/template_source.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_top_bottom.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_cancel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_new.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_favorite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/configure.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_rsub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/man.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_empty.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fill.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/koffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/openterm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/indent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_post_to.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_remove.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_o.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/encrypted.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_violet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_start.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcalendar.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/txt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/desktop.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdwriter_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kexi_kexi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/clear_left.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_locked.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_bitmap.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/button_ok.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/network_local.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/zip_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_breakoff.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kchart_chrt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editdelete.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/hdd_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_sound.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_l.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/transform.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_paren.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gear.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/exec.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_html.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_sound.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editpaste.png
@@ -70108,7 +38308,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
@@ -70463,6 +38662,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
@@ -70563,36 +38763,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/exec.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/fileclose.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileprint.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/template_source.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/netscape_doc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_unmount.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kde.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/scanner.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_type1.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tablet.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/log.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/viewmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdwriter_unmount.png
@@ -70676,6 +38847,38 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/launch.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/launch.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/template_source.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/paintbrush.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/netscape_doc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_unmount.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/soffice.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_established.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_sum.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filesaveas.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/previous.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/next.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/link_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate_ccw.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/window_nofullscreen.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kde.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/translate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/scanner.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/font_type1.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tablet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_red.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1leftarrow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/queue.png
@@ -70685,32 +38888,7 @@
force-reedit:
--- pics/emoticons/Makefile.in
+++ pics/emoticons/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(icondir)"
- iconDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(icon_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -70719,7 +38897,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -70728,7 +38906,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -70736,7 +38914,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -70746,7 +38924,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -70754,16 +38932,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -70771,7 +38940,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -480,7 +476,7 @@
+@@ -480,7 +484,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -70780,7 +38949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +514,9 @@
+@@ -518,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70792,61 +38961,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -537,7 +533,7 @@
- test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
- @list='$(icon_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
- done
-@@ -545,7 +541,7 @@
- uninstall-iconDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(icon_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
- done
-@@ -609,7 +605,7 @@
- clean-generic:
-
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
--- pics/hicolor/Makefile.in
+++ pics/hicolor/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 435799 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,12 +54,6 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- am__installdirs = "$(DESTDIR)$(hicolordir)"
- hicolorDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(hicolor_DATA)
-@@ -78,6 +72,8 @@
+@@ -78,6 +78,8 @@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -70855,7 +38972,7 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -119,8 +115,6 @@
+@@ -119,8 +121,6 @@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -70864,7 +38981,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -197,7 +191,6 @@
+@@ -197,7 +197,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -70872,7 +38989,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -234,6 +227,9 @@
+@@ -234,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -70882,7 +38999,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +285,7 @@
+@@ -289,6 +291,7 @@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -70890,16 +39007,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,8 +295,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
- arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
- bindir = @bindir@
-@@ -317,6 +312,7 @@
+@@ -317,6 +320,7 @@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
exec_prefix = @exec_prefix@
@@ -70907,13 +39015,7 @@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -475,13 +471,12 @@
- xdg_menudir = @xdg_menudir@
- hicolordir = $(kde_icondir)/hicolor
- hicolor_DATA = index.theme
--KDE_ICON = AUTO
- #>- all: all-am
- #>+ 1
+@@ -480,7 +484,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -70922,7 +39024,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +514,9 @@
+@@ -518,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70934,30 +39036,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -538,7 +533,7 @@
- test -z "$(hicolordir)" || $(mkdir_p) "$(DESTDIR)$(hicolordir)"
- @list='$(hicolor_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(hicolorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hicolordir)/$$f'"; \
- $(hicolorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hicolordir)/$$f"; \
- done
-@@ -546,7 +541,7 @@
- uninstall-hicolorDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(hicolor_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(hicolordir)/$$f'"; \
- rm -f "$(DESTDIR)$(hicolordir)/$$f"; \
- done
-@@ -610,7 +605,7 @@
- clean-generic:
+--- pics/Makefile.in
++++ pics/Makefile.in
+@@ -118,6 +118,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +161,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +273,9 @@
+ LUA = @LUA@
+ LUA_INCLUDES = @LUA_INCLUDES@
+ LUA_LIBS = @LUA_LIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -329,6 +331,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,6 +360,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +529,7 @@
- distclean-generic:
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -rm -f $(CONFIG_CLEAN_FILES)
+ .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*) \
+@@ -563,9 +567,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -925,7 +929,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in LICENSE.crystalsvg Makefile.am
++KDE_DIST=LICENSE.crystalsvg Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
More information about the pkg-kde-commits
mailing list