[Pkg-kde-commits] rev 1882 - branches/kde-3.4.0/packages/kdelibs/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Wed Sep 28 21:45:26 UTC 2005


Author: chrsmrtn
Date: 2005-09-28 21:45:23 +0000 (Wed, 28 Sep 2005)
New Revision: 1882

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Update kdelibs buildprep for new libkdefakes_pic.a.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff	2005-09-28 21:44:46 UTC (rev 1881)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff	2005-09-28 21:45:23 UTC (rev 1882)
@@ -1,65 +1,5 @@
 #DPATCHLEVEL=0
 # vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -277,6 +277,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,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*) \
-@@ -571,12 +574,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
-@@ -588,7 +591,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 $@
-@@ -1282,7 +1285,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in KDE3PORTING.html configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 Makefile.am acinclude.m4 Makefile.am.in 
-+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.am configure acinclude.m4 
- 
- #>+ 2
- docs-am:
 --- acinclude.m4
 +++ acinclude.m4
 @@ -1688,15 +1688,6 @@
@@ -1577,54 +1517,59 @@
  AC_MSG_RESULT([$SED])
  ])
  
---- arts/Makefile.in
-+++ arts/Makefile.in
+--- aclocal.m4
++++ aclocal.m4
 @@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  
-@@ -232,6 +232,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
- all: docs-am  all-recursive
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005  Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.5])])
++	 [AM_AUTOMAKE_VERSION([1.9.6])])
  
- .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*) \
-@@ -510,9 +513,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ # AM_AUX_DIR_EXPAND                                         -*- 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
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
  
- mostlyclean-libtool:
-@@ -976,7 +979,7 @@
- .NOEXPORT:
++# 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 -*-
  
- #>+ 2
--KDE_DIST=Makefile.in configure.in.in Makefile.am 
-+KDE_DIST=configure.in.in Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
+ # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- arts/kde/Makefile.in
 +++ arts/kde/Makefile.in
 @@ -1,4 +1,4 @@
@@ -1875,6 +1820,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- arts/Makefile.in
++++ arts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -472,7 +475,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*) \
+@@ -510,9 +513,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -976,7 +979,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in configure.in.in Makefile.am 
++KDE_DIST=configure.in.in Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- arts/message/Makefile.in
 +++ arts/message/Makefile.in
 @@ -1,4 +1,4 @@
@@ -9031,24 +9024,24 @@
  
  AH_BOTTOM([
  /* provide a definition for a 32 bit entity, usable as a typedef, possibly
---- dcop/KDE-ICE/Makefile.in
-+++ dcop/KDE-ICE/Makefile.in
+--- dcop/client/Makefile.in
++++ dcop/client/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
+@@ -15,8 +15,6 @@
+ 
  @SET_MAKE@
  
- 
--SOURCES = $(libkICE_la_SOURCES)
+-SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) $(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) $(dcopstart_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -296,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9058,16 +9051,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +525,7 @@
+@@ -553,7 +554,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*) \
-@@ -562,9 +563,9 @@
+@@ -591,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9077,43 +9070,26 @@
 -$(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:
---- dcop/Makefile.in
-+++ dcop/Makefile.in
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+--- dcop/dcopidl/Makefile.in
++++ dcop/dcopidl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -40,10 +40,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
  
  
- 
--#>- 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) 
+-SOURCES = $(dcopidl_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -172,9 +168,13 @@
- #>+ 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
- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
- 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
--	$(testdcop_SOURCES) $(testdcopc_SOURCES)
-+	$(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES) 
- #>- DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
- #>- 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
- #>- 	$(testdcop_SOURCES) $(testdcopc_SOURCES)
-@@ -363,6 +363,9 @@
+@@ -257,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9123,16 +9099,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -505,7 +506,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*) \
-@@ -678,9 +681,9 @@
+@@ -543,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9142,79 +9118,26 @@
 -$(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
-@@ -692,7 +695,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 $@
-@@ -1396,18 +1399,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
-@@ -1439,7 +1442,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 configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h Makefile.am libDCOP_weak.nmcheck 
-@@ -1564,8 +1567,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
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+--- dcop/dcopidl2cpp/Makefile.in
++++ dcop/dcopidl2cpp/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -15,8 +15,6 @@
- 
+@@ -16,8 +16,6 @@
  @SET_MAKE@
  
--SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) $(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) $(dcopstart_SOURCES)
+ 
+-SOURCES = $(dcopidl2cpp_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -259,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9224,16 +9147,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +554,7 @@
+@@ -504,7 +505,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*) \
-@@ -591,9 +592,9 @@
+@@ -542,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9245,24 +9168,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- dcop/dcopidl/Makefile.in
-+++ dcop/dcopidl/Makefile.in
+--- dcop/dcopidlng/Makefile.in
++++ dcop/dcopidlng/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(dcopidl_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -257,6 +255,9 @@
+@@ -230,6 +230,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9272,16 +9186,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +506,7 @@
+@@ -472,7 +475,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*) \
-@@ -543,9 +544,9 @@
+@@ -510,9 +513,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9291,10 +9205,19 @@
 -$(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)
---- dcop/dcopidl2cpp/Makefile.in
-+++ dcop/dcopidl2cpp/Makefile.in
+@@ -717,7 +720,7 @@
+ .NOEXPORT:
+ 
+ #>+ 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 
+ 
+ #>+ 2
+ docs-am:
+--- dcop/KDE-ICE/Makefile.in
++++ dcop/KDE-ICE/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -9305,12 +9228,12 @@
  @SET_MAKE@
  
  
--SOURCES = $(dcopidl2cpp_SOURCES)
+-SOURCES = $(libkICE_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -259,6 +257,9 @@
+@@ -249,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9320,16 +9243,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +505,7 @@
+@@ -524,7 +525,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*) \
-@@ -542,9 +543,9 @@
+@@ -562,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9339,17 +9262,43 @@
 -$(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)
---- dcop/dcopidlng/Makefile.in
-+++ dcop/dcopidlng/Makefile.in
+ 
+ clean-noinstLTLIBRARIES:
+--- dcop/Makefile.in
++++ dcop/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -230,6 +230,9 @@
+@@ -40,10 +40,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -172,9 +168,13 @@
+ #>+ 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
+ SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+-	$(testdcop_SOURCES) $(testdcopc_SOURCES)
++	$(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES) 
+ #>- DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ #>- 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+ #>- 	$(testdcop_SOURCES) $(testdcopc_SOURCES)
+@@ -363,6 +363,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9359,16 +9308,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
- all: docs-am  all-am
+@@ -640,7 +643,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*) \
-@@ -510,9 +513,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9378,17 +9327,61 @@
 -$(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)
-@@ -717,7 +720,7 @@
- .NOEXPORT:
  
+ dcop-path.h: stamp-h2
+@@ -692,7 +695,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 $@
+@@ -1396,18 +1399,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
--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:
+-mocs: dcopclient.moc
++mocs: testdcop.moc
+ 
+ #>+ 3
+ dcopserver.moc: $(srcdir)/dcopserver.h
+@@ -1439,7 +1442,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 configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h Makefile.am libDCOP_weak.nmcheck 
+@@ -1564,8 +1567,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
 @@ -1,4 +1,4 @@
@@ -9485,45 +9478,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -231,6 +231,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,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*) \
-@@ -508,9 +511,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- doc/common/Makefile.in
 +++ doc/common/Makefile.in
 @@ -1,4 +1,4 @@
@@ -9650,15 +9604,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- interfaces/Makefile.in
-+++ interfaces/Makefile.in
+--- doc/Makefile.in
++++ doc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -232,6 +232,9 @@
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9668,16 +9622,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -470,7 +473,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*) \
-@@ -511,9 +514,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9728,15 +9682,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- interfaces/kimproxy/Makefile.in
-+++ interfaces/kimproxy/Makefile.in
+--- interfaces/kimproxy/interface/Makefile.in
++++ interfaces/kimproxy/interface/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -231,6 +231,9 @@
+@@ -234,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9746,8 +9700,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
- all: docs-am  all-recursive
+@@ -479,7 +482,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -9755,7 +9709,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9767,15 +9721,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- interfaces/kimproxy/interface/Makefile.in
-+++ interfaces/kimproxy/interface/Makefile.in
+--- interfaces/kimproxy/library/icons/Makefile.in
++++ interfaces/kimproxy/library/icons/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -234,6 +234,9 @@
+@@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9785,7 +9739,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -454,7 +457,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9794,7 +9748,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -492,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9806,6 +9760,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -644,33 +647,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/kimproxy/library/Makefile.in
 +++ interfaces/kimproxy/library/Makefile.in
 @@ -1,4 +1,4 @@
@@ -9854,15 +9855,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- interfaces/kimproxy/library/icons/Makefile.in
-+++ interfaces/kimproxy/library/icons/Makefile.in
+--- interfaces/kimproxy/Makefile.in
++++ interfaces/kimproxy/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -215,6 +215,9 @@
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9872,8 +9873,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
- all: docs-am  all-am
+@@ -470,7 +473,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -9881,7 +9882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9893,53 +9894,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -644,33 +647,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,4 +1,4 @@
@@ -9979,24 +9933,24 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- interfaces/kmediaplayer/Makefile.in
-+++ interfaces/kmediaplayer/Makefile.in
+--- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
++++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -17,8 +17,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
  
  
- 
--SOURCES = $(libkmediaplayer_la_SOURCES)
+-SOURCES = $(kfileaudiopreview_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10006,7 +9960,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +537,7 @@
+@@ -509,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10015,7 +9969,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +575,9 @@
+@@ -547,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10025,26 +9979,26 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
-+++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+--- interfaces/kmediaplayer/Makefile.in
++++ interfaces/kmediaplayer/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -17,8 +17,6 @@
  
  
--SOURCES = $(kfileaudiopreview_la_SOURCES)
+ 
+-SOURCES = $(libkmediaplayer_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -261,6 +259,9 @@
+@@ -282,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10054,7 +10008,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +510,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10063,7 +10017,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +548,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10073,7 +10027,7 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- interfaces/kregexpeditor/Makefile.in
 +++ interfaces/kregexpeditor/Makefile.in
@@ -10336,6 +10290,45 @@
  	@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
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -473,7 +476,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*) \
+@@ -511,9 +514,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_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,4 +1,4 @@
@@ -10514,6 +10507,54 @@
  	@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/formats/Makefile.in
++++ kabc/formats/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabcformat_binary_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -520,7 +521,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*) \
+@@ -558,9 +559,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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
 @@ -1,4 +1,4 @@
@@ -10648,8 +10689,8 @@
  	@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
+--- kabc/plugins/dir/Makefile.in
++++ kabc/plugins/dir/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10660,12 +10701,12 @@
  
  
  
--SOURCES = $(kabcformat_binary_la_SOURCES)
+-SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -261,6 +259,9 @@
+@@ -273,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10675,7 +10716,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +521,7 @@
+@@ -534,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10684,7 +10725,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +559,9 @@
+@@ -572,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10696,63 +10737,24 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kabc/plugins/Makefile.in
-+++ kabc/plugins/Makefile.in
+--- kabc/plugins/evolution/Makefile.in
++++ kabc/plugins/evolution/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -231,6 +231,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,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*) \
-@@ -508,9 +511,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kabc/plugins/dir/Makefile.in
-+++ kabc/plugins/dir/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -17,8 +17,6 @@
  
  
  
--SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
+-SOURCES = $(kabc_evo_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -267,6 +265,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10762,7 +10764,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +535,7 @@
+@@ -517,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10771,7 +10773,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +573,9 @@
+@@ -555,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10783,8 +10785,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kabc/plugins/evolution/Makefile.in
-+++ kabc/plugins/evolution/Makefile.in
+--- kabc/plugins/file/Makefile.in
++++ kabc/plugins/file/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10795,12 +10797,12 @@
  
  
  
--SOURCES = $(kabc_evo_la_SOURCES)
+-SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -273,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10810,7 +10812,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -535,7 +536,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10819,7 +10821,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -573,9 +574,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10831,8 +10833,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kabc/plugins/file/Makefile.in
-+++ kabc/plugins/file/Makefile.in
+--- kabc/plugins/ldapkio/Makefile.in
++++ kabc/plugins/ldapkio/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -10843,12 +10845,12 @@
  
  
  
--SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
+-SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -277,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10858,7 +10860,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +536,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10867,7 +10869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +574,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10879,24 +10881,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kabc/plugins/ldapkio/Makefile.in
-+++ kabc/plugins/ldapkio/Makefile.in
+--- kabc/plugins/Makefile.in
++++ kabc/plugins/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -277,6 +275,9 @@
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10906,16 +10899,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +537,7 @@
+@@ -470,7 +473,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*) \
-@@ -574,9 +575,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10925,8 +10918,8 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kabc/plugins/net/Makefile.in
 +++ kabc/plugins/net/Makefile.in
 @@ -1,4 +1,4 @@
@@ -11167,45 +11160,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kate/Makefile.in
-+++ kate/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -233,6 +233,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,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*) \
-@@ -512,9 +515,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kate/data/Makefile.in
 +++ kate/data/Makefile.in
 @@ -1,4 +1,4 @@
@@ -11302,6 +11256,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kate/Makefile.in
++++ kate/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -233,6 +233,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -474,7 +477,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*) \
+@@ -512,9 +515,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kate/part/Makefile.in
 +++ kate/part/Makefile.in
 @@ -1,4 +1,4 @@
@@ -11500,45 +11493,6 @@
  katefiletype.lo: katefiletype.moc 
  kateview.lo: kateview.moc 
  nmcheck: 
---- kate/plugins/Makefile.in
-+++ kate/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -231,6 +231,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,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*) \
-@@ -508,9 +511,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kate/plugins/autobookmarker/Makefile.in
 +++ kate/plugins/autobookmarker/Makefile.in
 @@ -1,4 +1,4 @@
@@ -11731,6 +11685,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kate/plugins/Makefile.in
++++ kate/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -231,6 +231,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -470,7 +473,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*) \
+@@ -508,9 +511,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kate/plugins/wordcompletion/Makefile.in
 +++ kate/plugins/wordcompletion/Makefile.in
 @@ -1,4 +1,4 @@
@@ -11949,6 +11942,111 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kdecore/kconfig_compiler/Makefile.in
++++ kdecore/kconfig_compiler/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(autoexample_SOURCES) $(example_SOURCES) $(kconfig_compiler_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -545,7 +546,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*) \
+@@ -583,9 +584,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+--- kdecore/kconfig_compiler/tests/Makefile.in
++++ kdecore/kconfig_compiler/tests/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) $(test7_SOURCES) $(test8_SOURCES) $(test9_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -600,7 +601,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -638,9 +639,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-checkPROGRAMS:
+@@ -975,7 +976,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test4.h.ref test1.kcfg 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 test9.kcfgc test7.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref 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 test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg test8b.kcfg Makefile.in test8a.h.ref test4.h.ref test1.kcfg 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 test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- kdecore/Makefile.in
 +++ kdecore/Makefile.in
 @@ -1,4 +1,4 @@
@@ -11966,7 +12064,35 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -419,6 +417,9 @@
+@@ -105,6 +103,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 =  \
+@@ -230,10 +234,10 @@
+ #>+ 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) \
++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 \
+@@ -419,6 +423,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11976,7 +12102,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -794,7 +795,7 @@
+@@ -661,7 +668,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 \
+@@ -794,7 +801,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11985,7 +12120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -832,9 +833,9 @@
+@@ -832,9 +839,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11997,7 +12132,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  kdemacros.h: stamp-h3
-@@ -846,7 +847,7 @@
+@@ -846,7 +853,7 @@
  stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
  	@rm -f stamp-h3
  	cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
@@ -12006,7 +12141,28 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h3
  	touch $@
-@@ -1803,18 +1804,18 @@
+@@ -1070,6 +1077,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@
+@@ -1465,6 +1473,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))
+@@ -1803,18 +1817,18 @@
  mocs: kasyncio.moc
  
  #>+ 3
@@ -12031,7 +12187,7 @@
  
  #>+ 3
  kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
-@@ -1859,18 +1860,18 @@
+@@ -1859,18 +1873,18 @@
  mocs: ksock.moc
  
  #>+ 3
@@ -12056,7 +12212,7 @@
  
  #>+ 3
  kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
-@@ -1908,18 +1909,18 @@
+@@ -1908,18 +1922,18 @@
  mocs: klibloader.moc
  
  #>+ 3
@@ -12081,7 +12237,7 @@
  
  #>+ 3
  kaccelprivate.moc: $(srcdir)/kaccelprivate.h
-@@ -1937,7 +1938,7 @@
+@@ -1937,7 +1951,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12090,7 +12246,7 @@
  
  #>+ 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 kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h kdebugrc kdebug.areas kdebugdcopiface.h kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in 
-@@ -1995,7 +1996,7 @@
+@@ -1995,7 +2009,7 @@
  
  
  #>+ 11
@@ -12099,111 +12255,6 @@
  	@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,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(autoexample_SOURCES) $(example_SOURCES) $(kconfig_compiler_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -545,7 +546,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*) \
-@@ -583,9 +584,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
---- kdecore/kconfig_compiler/tests/Makefile.in
-+++ kdecore/kconfig_compiler/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--SOURCES = $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) $(test7_SOURCES) $(test8_SOURCES) $(test9_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -322,6 +320,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -638,9 +639,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-checkPROGRAMS:
-@@ -975,7 +976,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=test8b.cpp.ref test6.kcfgc test2.kcfgc test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg Makefile.in test8b.kcfg test8a.h.ref test4.h.ref test1.kcfg 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 test9.kcfgc test7.kcfgc test3.cpp.ref test6.h.ref test7.cpp.ref 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 test4.cpp.ref test1.kcfgc test7.h.ref test6.cpp.ref test6.kcfg test8b.kcfg Makefile.in test8a.h.ref test4.h.ref test1.kcfg 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 test2.h.ref test4.kcfg test8a.kcfgc test9.h.ref test8b.h.ref test5.kcfgc test2.kcfg Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kdecore/malloc/Makefile.in
 +++ kdecore/malloc/Makefile.in
 @@ -1,4 +1,4 @@
@@ -12676,24 +12727,37 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kdeprint/Makefile.in
-+++ kdeprint/Makefile.in
+--- kdeprint/cups/cupsdconf2/Makefile.in
++++ kdeprint/cups/cupsdconf2/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -18,8 +18,6 @@
+@@ -20,10 +20,6 @@
  
  
  
--SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
+-#>- SOURCES = $(cupsdconf_la_SOURCES)
+-#>+ 1
+-SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -341,6 +339,9 @@
+@@ -125,7 +121,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(cupsdconf_la_SOURCES)
++#>- SOURCES = $(cupsdconf_la_SOURCES)
++#>+ 1
++SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
+ #>- DIST_SOURCES = $(cupsdconf_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
+@@ -297,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12703,16 +12767,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -663,7 +664,7 @@
+@@ -568,7 +569,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*) \
-@@ -701,9 +702,9 @@
+@@ -606,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12722,165 +12786,56 @@
 -$(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)
+@@ -1090,22 +1091,22 @@
+ mocs: cupsdnetworkpage.moc
  
- clean-noinstLIBRARIES:
-@@ -1540,13 +1541,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
  
-@@ -1554,11 +1548,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
-@@ -1568,6 +1562,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
- 
-@@ -1596,11 +1597,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
-@@ -1610,11 +1611,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 
+@@ -1152,7 +1153,7 @@
  
- #>+ 3
- kpfilterpage.moc: $(srcdir)/kpfilterpage.h
-@@ -1624,18 +1625,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; \
+@@ -1164,7 +1165,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
-@@ -1652,18 +1653,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
-@@ -1701,18 +1702,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
-@@ -1723,7 +1724,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,4 +1,4 @@
@@ -12972,115 +12927,6 @@
  	@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,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,10 +20,6 @@
- 
- 
- 
--#>- SOURCES = $(cupsdconf_la_SOURCES)
--#>+ 1
--SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -125,7 +121,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(cupsdconf_la_SOURCES)
-+#>- SOURCES = $(cupsdconf_la_SOURCES)
-+#>+ 1
-+SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
- #>- DIST_SOURCES = $(cupsdconf_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
-@@ -297,6 +295,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -568,7 +569,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*) \
-@@ -606,9 +607,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1090,22 +1091,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 
-@@ -1152,7 +1153,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; \
-@@ -1164,7 +1165,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,4 +1,4 @@
@@ -13360,6 +13206,211 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kdeprint/Makefile.in
++++ kdeprint/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -341,6 +339,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -663,7 +664,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)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -701,9 +702,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLIBRARIES:
+@@ -1540,13 +1541,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
+ 
+@@ -1554,11 +1548,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
+ 
+ #>+ 3
+ marginpreview.moc: $(srcdir)/marginpreview.h
+@@ -1568,6 +1562,13 @@
+ mocs: marginpreview.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
+ 
+@@ -1596,11 +1597,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
+ 
+ #>+ 3
+ kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
+@@ -1610,11 +1611,11 @@
+ mocs: kpgeneralpage.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
+ 
+ #>+ 3
+ kpfilterpage.moc: $(srcdir)/kpfilterpage.h
+@@ -1624,18 +1625,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
+-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
+@@ -1652,18 +1653,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
+@@ -1701,18 +1702,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
+@@ -1723,7 +1724,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
 @@ -1,4 +1,4 @@
@@ -13968,6 +14019,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
+--- kdeprint/tools/escputil/Makefile.in
++++ kdeprint/tools/escputil/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -514,7 +515,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*) \
+@@ -552,9 +553,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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,4 +1,4 @@
@@ -14007,8 +14106,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdeprint/tools/escputil/Makefile.in
-+++ kdeprint/tools/escputil/Makefile.in
+--- kdesu/Makefile.in
++++ kdesu/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -14019,12 +14118,12 @@
  
  
  
--SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+-SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -283,6 +281,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14034,16 +14133,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +515,7 @@
+@@ -536,7 +537,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*) \
-@@ -552,9 +553,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14053,26 +14152,104 @@
 -$(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)
---- kdesu/Makefile.in
-+++ kdesu/Makefile.in
+--- kdeui/about/Makefile.in
++++ kdeui/about/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
+@@ -225,6 +225,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -472,7 +475,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*) \
+@@ -510,9 +513,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kdeui/colors/Makefile.in
++++ kdeui/colors/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -215,6 +215,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -453,7 +456,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*) \
+@@ -491,9 +494,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kdeui/kdetrayproxy/Makefile.in
++++ kdeui/kdetrayproxy/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -17,8 +17,6 @@
  
  
  
--SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+-SOURCES = $(kded_kdetrayproxy_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14082,16 +14259,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +537,7 @@
+@@ -516,7 +517,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*) \
-@@ -574,9 +575,9 @@
+@@ -554,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14101,7 +14278,7 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- kdeui/Makefile.in
 +++ kdeui/Makefile.in
@@ -14481,132 +14658,6 @@
  	@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,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -225,6 +225,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,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*) \
-@@ -510,9 +513,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kdeui/colors/Makefile.in
-+++ kdeui/colors/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -215,6 +215,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,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*) \
-@@ -491,9 +494,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kdeui/kdetrayproxy/Makefile.in
-+++ kdeui/kdetrayproxy/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kded_kdetrayproxy_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -266,6 +264,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -516,7 +517,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*) \
-@@ -554,9 +555,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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/tests/Makefile.in
 +++ kdeui/tests/Makefile.in
 @@ -1,4 +1,4 @@
@@ -14975,54 +15026,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
---- khtml/Makefile.in
-+++ khtml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -36,8 +36,6 @@
- 
- 
- 
--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@
-@@ -362,6 +360,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -676,7 +677,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -714,9 +715,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
 --- khtml/css/Makefile.in
 +++ khtml/css/Makefile.in
 @@ -1,4 +1,4 @@
@@ -15224,6 +15227,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
+--- khtml/java/dummy/Makefile.in
++++ khtml/java/dummy/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libkjava_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -497,7 +498,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*) \
+@@ -535,9 +536,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
 --- khtml/java/Makefile.in
 +++ khtml/java/Makefile.in
 @@ -1,4 +1,4 @@
@@ -15352,24 +15403,24 @@
  kjavadownloader.lo: kjavadownloader.moc 
  kjavaapplet.lo: kjavaapplet.moc 
  nmcheck: 
---- khtml/java/dummy/Makefile.in
-+++ khtml/java/dummy/Makefile.in
+--- khtml/java/tests/Makefile.in
++++ khtml/java/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -15,8 +15,6 @@
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
  
  @SET_MAKE@
- 
--SOURCES = $(libkjava_la_SOURCES)
+-SOURCES = $(testserver_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -246,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15379,7 +15430,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +498,7 @@
+@@ -491,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15388,7 +15439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +536,9 @@
+@@ -529,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15398,26 +15449,26 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- khtml/java/tests/Makefile.in
-+++ khtml/java/tests/Makefile.in
+ 
+ clean-checkPROGRAMS:
+--- khtml/kmultipart/Makefile.in
++++ khtml/kmultipart/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
  
- @SET_MAKE@
--SOURCES = $(testserver_SOURCES)
+ 
+-SOURCES = $(libkmultipart_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -259,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15427,7 +15478,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +492,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15436,7 +15487,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +530,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15446,26 +15497,26 @@
 -$(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:
---- khtml/kmultipart/Makefile.in
-+++ khtml/kmultipart/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- khtml/Makefile.in
++++ khtml/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -36,8 +36,6 @@
  
  
--SOURCES = $(libkmultipart_la_SOURCES)
+ 
+-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@
-@@ -259,6 +257,9 @@
+@@ -362,6 +360,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15475,16 +15526,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -676,7 +677,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*) \
-@@ -551,9 +552,9 @@
+@@ -714,9 +715,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15948,54 +15999,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
---- kio/Makefile.in
-+++ kio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -35,8 +35,6 @@
- 
- 
- 
--SOURCES = $(libkio_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -308,6 +306,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,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*) \
-@@ -619,9 +620,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
 --- kio/bookmarks/Makefile.in
 +++ kio/bookmarks/Makefile.in
 @@ -1,4 +1,4 @@
@@ -16869,24 +16872,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kio/kssl/Makefile.in
-+++ kio/kssl/Makefile.in
+--- kio/kssl/kssl/caroot/Makefile.in
++++ kio/kssl/kssl/caroot/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libkssl_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16896,16 +16890,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +623,7 @@
+@@ -465,7 +468,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +661,9 @@
+@@ -503,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16916,16 +16910,7 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- ksslconfig.h: stamp-h4
-@@ -674,7 +675,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 $@
+ mostlyclean-libtool:
 --- kio/kssl/kssl/Makefile.in
 +++ kio/kssl/kssl/Makefile.in
 @@ -1,4 +1,4 @@
@@ -16965,15 +16950,24 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kio/kssl/kssl/caroot/Makefile.in
-+++ kio/kssl/kssl/caroot/Makefile.in
+--- kio/kssl/Makefile.in
++++ kio/kssl/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -225,6 +225,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkssl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16983,16 +16977,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
- all: docs-am  all-am
+@@ -622,7 +623,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -660,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17003,40 +16997,34 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
---- kio/misc/Makefile.in
-+++ kio/misc/Makefile.in
+ ksslconfig.h: stamp-h4
+@@ -674,7 +675,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
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -37,10 +37,6 @@
+@@ -35,8 +35,6 @@
  
  
  
--#>- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
--#>+ 1
--SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES) 
+-SOURCES = $(libkio_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -140,8 +136,11 @@
- #>+ 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)
-+#>+ 2
- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
--	$(ktelnetservice_SOURCES)
-+	$(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES) 
- #>- DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
- #>- 	$(ktelnetservice_SOURCES)
- #>+ 2
-@@ -331,6 +330,9 @@
+@@ -308,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17046,16 +17034,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +603,7 @@
+@@ -581,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(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*) \
-@@ -639,9 +641,9 @@
+@@ -619,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17065,7 +17053,7 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- kio/misc/kdesasl/Makefile.in
 +++ kio/misc/kdesasl/Makefile.in
@@ -17403,15 +17391,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kio/pics/Makefile.in
-+++ kio/pics/Makefile.in
+--- kio/misc/Makefile.in
++++ kio/misc/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -215,6 +215,9 @@
+@@ -37,10 +37,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -140,8 +136,11 @@
+ #>+ 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)
++#>+ 2
+ SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+-	$(ktelnetservice_SOURCES)
++	$(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES) 
+ #>- DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+ #>- 	$(ktelnetservice_SOURCES)
+ #>+ 2
+@@ -331,6 +330,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17421,16 +17433,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,7 +458,7 @@
- all: docs-am  all-am
+@@ -601,7 +603,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -493,9 +496,9 @@
+@@ -639,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17440,26 +17452,17 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kio/tests/Makefile.in
-+++ kio/tests/Makefile.in
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kio/pics/Makefile.in
++++ kio/pics/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -33,8 +33,6 @@
- #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- #    Boston, MA 02111-1307, USA.
- 
--SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) $(jobtest_SOURCES) $(kclipboardtest_SOURCES) $(kdcopcheck_SOURCES) $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) $(kionetrctest_SOURCES) $(kiopassdlgtest_SOURCES) $(kioslavetest_SOURCES) $(kmfitest_SOURCES) $(kmimefromext_SOURCES) $(kmimemagictest_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@
-@@ -493,6 +491,9 @@
+@@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17469,16 +17472,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -767,7 +768,7 @@
+@@ -455,7 +458,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*) \
-@@ -805,9 +806,9 @@
+@@ -493,9 +496,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17488,17 +17491,26 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
---- kioslave/Makefile.in
-+++ kioslave/Makefile.in
+ 
+ mostlyclean-libtool:
+--- kio/tests/Makefile.in
++++ kio/tests/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -249,6 +249,9 @@
+@@ -33,8 +33,6 @@
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, USA.
+ 
+-SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) $(jobtest_SOURCES) $(kclipboardtest_SOURCES) $(kdcopcheck_SOURCES) $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) $(kionetrctest_SOURCES) $(kiopassdlgtest_SOURCES) $(kioslavetest_SOURCES) $(kmfitest_SOURCES) $(kmimefromext_SOURCES) $(kmimemagictest_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@
+@@ -493,6 +491,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17508,16 +17520,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
- all: docs-am  all-recursive
+@@ -767,7 +768,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*) \
-@@ -527,9 +530,9 @@
+@@ -805,9 +806,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17527,8 +17539,8 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
 --- kioslave/bzip2/Makefile.in
 +++ kioslave/bzip2/Makefile.in
 @@ -1,4 +1,4 @@
@@ -17721,67 +17733,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/http/Makefile.in
-+++ kioslave/http/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -21,10 +21,6 @@
- 
- 
- 
--#>- 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@
-@@ -121,7 +117,9 @@
- #>+ 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)
-+#>- 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) 
- #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
- #>- 	$(kio_http_cache_cleaner_la_SOURCES)
- #>+ 2
-@@ -309,6 +307,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -570,7 +571,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -608,9 +609,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
 --- kioslave/http/kcookiejar/Makefile.in
 +++ kioslave/http/kcookiejar/Makefile.in
 @@ -1,4 +1,4 @@
@@ -17941,24 +17892,37 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
---- kioslave/metainfo/Makefile.in
-+++ kioslave/metainfo/Makefile.in
+--- kioslave/http/Makefile.in
++++ kioslave/http/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -17,8 +17,6 @@
+@@ -21,10 +21,6 @@
  
  
  
--SOURCES = $(kio_metainfo_la_SOURCES)
+-#>- 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@
-@@ -263,6 +261,9 @@
+@@ -121,7 +117,9 @@
+ #>+ 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)
++#>- 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) 
+ #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
+ #>- 	$(kio_http_cache_cleaner_la_SOURCES)
+ #>+ 2
+@@ -309,6 +307,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17968,16 +17932,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +513,7 @@
+@@ -570,7 +571,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +551,9 @@
+@@ -608,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17989,24 +17953,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kjs/Makefile.in
-+++ kjs/Makefile.in
+--- kioslave/Makefile.in
++++ kioslave/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -34,8 +34,6 @@
- #    Boston, MA 02111-1307, USA.
+@@ -249,6 +249,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -489,7 +492,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*) \
+@@ -527,9 +530,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) $(testkjs_static_SOURCES)
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kioslave/metainfo/Makefile.in
++++ kioslave/metainfo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kio_metainfo_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -310,6 +308,9 @@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18016,16 +18019,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -512,7 +513,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*) \
-@@ -632,9 +633,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18035,26 +18038,26 @@
 -$(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: $(top_builddir)/config.status $(srcdir)/global.h.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
---- kmdi/Makefile.in
-+++ kmdi/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kjs/Makefile.in
++++ kjs/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -34,8 +34,6 @@
+ #    Boston, MA 02111-1307, USA.
  
  
--SOURCES = $(libkmdi_la_SOURCES)
+-SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) $(testkjs_static_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -310,6 +308,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18064,7 +18067,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +539,7 @@
+@@ -594,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18073,7 +18076,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +577,9 @@
+@@ -632,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18083,51 +18086,8 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1160,18 +1161,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
-@@ -1217,7 +1218,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 
-@@ -1264,7 +1265,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: $(top_builddir)/config.status $(srcdir)/global.h.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 --- kmdi/kmdi/Makefile.in
 +++ kmdi/kmdi/Makefile.in
 @@ -1,4 +1,4 @@
@@ -18236,6 +18196,97 @@
 +mainwindow.o: mainwindow.moc 
  toolviewaccessor.lo: toolviewaccessor.moc 
  dockcontainer.o: dockcontainer.moc 
+--- kmdi/Makefile.in
++++ kmdi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkmdi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -538,7 +539,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*) \
+@@ -576,9 +577,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -1160,18 +1161,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
+@@ -1217,7 +1218,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 
+@@ -1264,7 +1265,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
 @@ -1,4 +1,4 @@
@@ -18681,15 +18732,24 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kspell2/plugins/Makefile.in
-+++ kspell2/plugins/Makefile.in
+--- kspell2/plugins/aspell/Makefile.in
++++ kspell2/plugins/aspell/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -231,6 +231,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kspell_aspell_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18699,16 +18759,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
- all: docs-am  all-recursive
+@@ -517,7 +518,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*) \
-@@ -509,9 +512,9 @@
+@@ -555,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18718,10 +18778,10 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kspell2/plugins/aspell/Makefile.in
-+++ kspell2/plugins/aspell/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kspell2/plugins/ispell/Makefile.in
++++ kspell2/plugins/ispell/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18732,12 +18792,12 @@
  @SET_MAKE@
  
  
--SOURCES = $(kspell_aspell_la_SOURCES)
+-SOURCES = $(kspell_ispell_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18747,7 +18807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -527,7 +528,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18756,7 +18816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -565,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18768,24 +18828,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kspell2/plugins/ispell/Makefile.in
-+++ kspell2/plugins/ispell/Makefile.in
+--- kspell2/plugins/Makefile.in
++++ kspell2/plugins/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kspell_ispell_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -266,6 +264,9 @@
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18795,16 +18846,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -527,7 +528,7 @@
+@@ -471,7 +474,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*) \
-@@ -565,9 +566,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18814,8 +18865,8 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kspell2/tests/Makefile.in
 +++ kspell2/tests/Makefile.in
 @@ -1,4 +1,4 @@
@@ -18962,45 +19013,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kstyles/Makefile.in
-+++ kstyles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -231,6 +231,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,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*) \
-@@ -508,9 +511,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kstyles/highcolor/Makefile.in
 +++ kstyles/highcolor/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19289,24 +19301,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kstyles/plastik/Makefile.in
-+++ kstyles/plastik/Makefile.in
+--- kstyles/Makefile.in
++++ kstyles/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(plastik_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19316,16 +19319,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +533,7 @@
+@@ -470,7 +473,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*) \
-@@ -570,9 +571,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19335,8 +19338,8 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kstyles/plastik/config/Makefile.in
 +++ kstyles/plastik/config/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19385,6 +19388,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kstyles/plastik/Makefile.in
++++ kstyles/plastik/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(plastik_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -532,7 +533,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*) \
+@@ -570,9 +571,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kstyles/riscos/Makefile.in
 +++ kstyles/riscos/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19472,6 +19523,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- kstyles/utils/installtheme/Makefile.in
++++ kstyles/utils/installtheme/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(kinstalltheme_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -503,7 +504,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*) \
+@@ -541,9 +542,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
 --- kstyles/utils/Makefile.in
 +++ kstyles/utils/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19511,24 +19610,24 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kstyles/utils/installtheme/Makefile.in
-+++ kstyles/utils/installtheme/Makefile.in
+--- kstyles/web/Makefile.in
++++ kstyles/web/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -15,8 +15,6 @@
+@@ -17,8 +17,6 @@
  
- @SET_MAKE@
  
--SOURCES = $(kinstalltheme_SOURCES)
+ 
+-SOURCES = $(webstyle_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19538,7 +19637,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -516,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19547,7 +19646,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -554,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19557,26 +19656,26 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kstyles/web/Makefile.in
-+++ kstyles/web/Makefile.in
+--- kutils/ksettings/Makefile.in
++++ kutils/ksettings/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -17,8 +17,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
  
  
- 
--SOURCES = $(webstyle_la_SOURCES)
+-SOURCES = $(libksettings_la_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -266,6 +264,9 @@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19586,7 +19685,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +517,7 @@
+@@ -508,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19595,7 +19694,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +555,9 @@
+@@ -546,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19605,8 +19704,8 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ clean-noinstLTLIBRARIES:
 --- kutils/Makefile.in
 +++ kutils/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19719,54 +19818,6 @@
  	@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,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libksettings_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -263,6 +261,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -508,7 +509,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*) \
-@@ -546,9 +547,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
 --- kutils/tests/Makefile.in
 +++ kutils/tests/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19815,45 +19866,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
---- kwallet/Makefile.in
-+++ kwallet/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -232,6 +232,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,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*) \
-@@ -511,9 +514,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kwallet/backend/Makefile.in
 +++ kwallet/backend/Makefile.in
 @@ -1,4 +1,4 @@
@@ -19998,6 +20010,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kwallet/Makefile.in
++++ kwallet/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -473,7 +476,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*) \
+@@ -511,9 +514,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kwallet/tests/Makefile.in
 +++ kwallet/tests/Makefile.in
 @@ -1,4 +1,4 @@
@@ -20277,15 +20328,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- mimetypes/Makefile.in
-+++ mimetypes/Makefile.in
+--- Makefile.in
++++ Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -241,6 +241,9 @@
+@@ -277,6 +277,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20295,27 +20346,48 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
- all: docs-am  all-recursive
- 
+@@ -529,7 +532,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*) \
-@@ -520,9 +523,9 @@
+@@ -571,12 +574,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	$(SHELL) ./config.status --recheck
  
 -$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>- 	cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ 	cd $(srcdir) && rm -f configure
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
- mostlyclean-libtool:
+ config.h: stamp-h1
+@@ -588,7 +591,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 $@
+@@ -1282,7 +1285,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Mainpage.dox subdirs Makefile.in KDE3PORTING.html configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 Makefile.am acinclude.m4 Makefile.am.in 
++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.am configure acinclude.m4 
+ 
+ #>+ 2
+ docs-am:
 --- mimetypes/application/Makefile.in
 +++ mimetypes/application/Makefile.in
 @@ -1,4 +1,4 @@
@@ -20490,6 +20562,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- mimetypes/Makefile.in
++++ mimetypes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -482,7 +485,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*) \
+@@ -520,9 +523,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- mimetypes/message/Makefile.in
 +++ mimetypes/message/Makefile.in
 @@ -1,4 +1,4 @@
@@ -20733,24 +20844,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- pics/Makefile.in
-+++ pics/Makefile.in
+--- pics/crystalsvg/kde/Makefile.in
++++ pics/crystalsvg/kde/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.9.5 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
  # @configure_input@
  
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -272,6 +270,9 @@
+@@ -217,6 +217,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20760,16 +20862,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +521,7 @@
+@@ -457,7 +460,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*) \
-@@ -558,9 +559,9 @@
+@@ -495,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20779,14 +20881,14 @@
 -$(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)
-@@ -924,7 +925,7 @@
+ 
+ mostlyclean-libtool:
+@@ -653,7 +656,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Makefile.in LICENSE.crystalsvg Makefile.am 
-+KDE_DIST=LICENSE.crystalsvg Makefile.in Makefile.am 
+-KDE_DIST=cr22-action-kde-0032.png cr32-action-kde-0043.png cr22-action-kde-0025.png cr32-action-kde-0024.png cr22-action-kde-0013.png cr22-action-kde-0014.png cr32-action-kde-0038.png cr22-action-kde-0045.png cr22-action-kde-0039.png cr32-action-kde-0004.png cr32-action-kde-0034.png cr22-action-kde-0028.png cr22-action-kde-0015.png cr22-action-kde-0044.png cr32-action-kde-0046.png cr22-action-kde-0010.png cr22-action-kde-0038.png cr32-action-kde-0035.png cr22-action-kde-0041.png cr32-action-kde-0005.png cr32-action-kde-0026.png cr32-action-kde-0033.png cr22-action-kde-0011.png cr22-action-kde-0024.png cr22-action-kde-0046.png cr32-action-kde-0010.png cr32-action-kde-0042.png cr22-action-kde-0008.png cr32-action-kde-0044.png cr32-action-kde-0017.png cr22-action-kde-0048.png cr22-action-kde-0002.png cr32-action-kde-0018.png cr32-action-kde-0011.png cr32-action-kde-0041.png cr32-action-kde-0001.png cr32-action-kde-0019.png cr32-action-kde-0015.png cr-action-kde-sources.tar.gz cr32-action-kde-0029.png cr32-action-kde-0020.png cr22-action-kde-0006.png cr22-action-kde-0007.png cr22-action-kde-0016.png cr32-action-kde-0030.png cr32-action-kde-0008.png cr22-action-kde-0009.png cr32-action-kde-0003.png cr32-action-kde-0047.png cr22-action-kde-0001.png cr22-action-kde-0027.png cr22-action-kde-0031.png cr32-action-kde-0039.png cr32-action-kde-0021.png cr22-action-kde-0042.png cr32-action-kde-0037.png cr32-action-kde-0031.png cr22-action-kde-0023.png cr22-action-kde-0012.png cr22-action-kde-0004.png cr22-action-kde-0017.png cr32-action-kde-0009.png cr22-action-kde-0020.png cr32-action-kde-0013.png cr22-action-kde-0040.png cr22-action-kde-0003.png cr22-action-kde-0034.png cr32-action-kde-0012.png cr22-action-kde-0005.png cr22-action-kde-0043.png cr32-action-kde-0028.png cr32-action-kde-0016.png cr22-action-kde-0037.png cr22-action-kde-0036.png cr32-action-kde-0022.png cr32-action-kde-0014.png cr22-action-kde-0019.png Makefile.am cr22-action-kde-0029.png cr32-action-kde-0007.png cr32-action-kde-0025.png cr22-action-kde-0035.png cr32-action-kde-0048.png cr22-action-kde-0021.png cr22-action-kde-0022.png cr32-action-kde-0045.png Makefile.in cr32-action-kde-0023.png cr22-action-kde-0030.png cr22-action-kde-0033.png cr32-action-kde-0027.png cr32-action-kde-0006.png cr32-action-kde-0002.png cr22-action-kde-0018.png cr32-action-kde-0036.png cr32-action-kde-0032.png cr22-action-kde-0047.png cr32-action-kde-0040.png cr22-action-kde-0026.png 
++KDE_DIST=cr22-action-kde-0032.png cr32-action-kde-0043.png cr22-action-kde-0025.png cr32-action-kde-0024.png cr22-action-kde-0013.png cr22-action-kde-0014.png cr32-action-kde-0038.png cr22-action-kde-0045.png cr22-action-kde-0039.png cr32-action-kde-0004.png cr32-action-kde-0034.png cr22-action-kde-0028.png cr22-action-kde-0015.png cr22-action-kde-0044.png cr32-action-kde-0046.png cr22-action-kde-0010.png cr22-action-kde-0038.png cr32-action-kde-0035.png cr22-action-kde-0041.png cr32-action-kde-0005.png cr32-action-kde-0026.png cr32-action-kde-0033.png cr22-action-kde-0011.png cr22-action-kde-0024.png cr22-action-kde-0046.png cr32-action-kde-0010.png cr32-action-kde-0042.png cr22-action-kde-0008.png cr32-action-kde-0044.png cr32-action-kde-0017.png cr22-action-kde-0048.png cr22-action-kde-0002.png cr32-action-kde-0018.png cr32-action-kde-0011.png cr32-action-kde-0041.png cr32-action-kde-0001.png cr32-action-kde-0019.png cr32-action-kde-0015.png cr-action-kde-sources.tar.gz cr32-action-kde-0029.png cr32-action-kde-0020.png cr22-action-kde-0006.png cr22-action-kde-0007.png cr22-action-kde-0016.png cr32-action-kde-0030.png cr32-action-kde-0008.png cr22-action-kde-0009.png cr32-action-kde-0003.png cr32-action-kde-0047.png cr22-action-kde-0001.png cr22-action-kde-0027.png cr22-action-kde-0031.png cr32-action-kde-0039.png cr32-action-kde-0021.png cr22-action-kde-0042.png cr32-action-kde-0037.png cr32-action-kde-0031.png cr22-action-kde-0023.png cr22-action-kde-0012.png cr22-action-kde-0004.png cr22-action-kde-0017.png cr32-action-kde-0009.png cr22-action-kde-0020.png cr32-action-kde-0013.png cr22-action-kde-0040.png cr22-action-kde-0003.png cr22-action-kde-0034.png cr22-action-kde-0005.png cr32-action-kde-0012.png cr22-action-kde-0043.png cr32-action-kde-0028.png cr32-action-kde-0016.png cr22-action-kde-0037.png cr22-action-kde-0036.png cr32-action-kde-0022.png cr32-action-kde-0014.png cr22-action-kde-0019.png Makefile.am cr22-action-kde-0029.png cr32-action-kde-0007.png cr32-action-kde-0025.png cr22-action-kde-0035.png cr32-action-kde-0048.png cr22-action-kde-0021.png cr22-action-kde-0022.png cr32-action-kde-0045.png Makefile.in cr32-action-kde-0023.png cr22-action-kde-0030.png cr22-action-kde-0033.png cr32-action-kde-0027.png cr32-action-kde-0006.png cr32-action-kde-0002.png cr22-action-kde-0018.png cr32-action-kde-0036.png cr32-action-kde-0032.png cr22-action-kde-0047.png cr32-action-kde-0040.png cr22-action-kde-0026.png 
  
  #>+ 2
  docs-am:
@@ -28051,54 +28153,6 @@
  
  #>+ 15
  force-reedit:
---- pics/crystalsvg/kde/Makefile.in
-+++ pics/crystalsvg/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -217,6 +217,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,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*) \
-@@ -495,9 +498,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -653,7 +656,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr22-action-kde-0032.png cr32-action-kde-0043.png cr22-action-kde-0025.png cr32-action-kde-0024.png cr22-action-kde-0013.png cr22-action-kde-0014.png cr32-action-kde-0038.png cr22-action-kde-0045.png cr22-action-kde-0039.png cr32-action-kde-0004.png cr32-action-kde-0034.png cr22-action-kde-0028.png cr22-action-kde-0015.png cr22-action-kde-0044.png cr32-action-kde-0046.png cr22-action-kde-0010.png cr22-action-kde-0038.png cr32-action-kde-0035.png cr22-action-kde-0041.png cr32-action-kde-0005.png cr32-action-kde-0026.png cr32-action-kde-0033.png cr22-action-kde-0011.png cr22-action-kde-0024.png cr22-action-kde-0046.png cr32-action-kde-0010.png cr32-action-kde-0042.png cr22-action-kde-0008.png cr32-action-kde-0044.png cr32-action-kde-0017.png cr22-action-kde-0048.png cr22-action-kde-0002.png cr32-action-kde-0018.png cr32-action-kde-0011.png cr32-action-kde-0041.png cr32-action-kde-0001.png cr32-action-kde-0019.png cr32-action-kde-0015.png cr-action-kde-sources.tar.gz cr32-action-kde-0029.png cr32-action-kde-0020.png cr22-action-kde-0006.png cr22-action-kde-0007.png cr22-action-kde-0016.png cr32-action-kde-0030.png cr32-action-kde-0008.png cr22-action-kde-0009.png cr32-action-kde-0003.png cr32-action-kde-0047.png cr22-action-kde-0001.png cr22-action-kde-0027.png cr22-action-kde-0031.png cr32-action-kde-0039.png cr32-action-kde-0021.png cr22-action-kde-0042.png cr32-action-kde-0037.png cr32-action-kde-0031.png cr22-action-kde-0023.png cr22-action-kde-0012.png cr22-action-kde-0004.png cr22-action-kde-0017.png cr32-action-kde-0009.png cr22-action-kde-0020.png cr32-action-kde-0013.png cr22-action-kde-0040.png cr22-action-kde-0003.png cr22-action-kde-0034.png cr32-action-kde-0012.png cr22-action-kde-0005.png cr22-action-kde-0043.png cr32-action-kde-0028.png cr32-action-kde-0016.png cr22-action-kde-0037.png cr22-action-kde-0036.png cr32-action-kde-0022.png cr32-action-kde-0014.png cr22-action-kde-0019.png Makefile.am cr22-action-kde-0029.png cr32-action-kde-0007.png cr32-action-kde-0025.png cr22-action-kde-0035.png cr32-action-kde-0048.png cr22-action-kde-0021.png cr22-action-kde-0022.png cr32-action-kde-0045.png Makefile.in cr32-action-kde-0023.png cr22-action-kde-0030.png cr22-action-kde-0033.png cr32-action-kde-0027.png cr32-action-kde-0006.png cr32-action-kde-0002.png cr22-action-kde-0018.png cr32-action-kde-0036.png cr32-action-kde-0032.png cr22-action-kde-0047.png cr32-action-kde-0040.png cr22-action-kde-0026.png 
-+KDE_DIST=cr22-action-kde-0032.png cr32-action-kde-0043.png cr22-action-kde-0025.png cr32-action-kde-0024.png cr22-action-kde-0013.png cr22-action-kde-0014.png cr32-action-kde-0038.png cr22-action-kde-0045.png cr22-action-kde-0039.png cr32-action-kde-0004.png cr32-action-kde-0034.png cr22-action-kde-0028.png cr22-action-kde-0015.png cr22-action-kde-0044.png cr32-action-kde-0046.png cr22-action-kde-0010.png cr22-action-kde-0038.png cr32-action-kde-0035.png cr22-action-kde-0041.png cr32-action-kde-0005.png cr32-action-kde-0026.png cr32-action-kde-0033.png cr22-action-kde-0011.png cr22-action-kde-0024.png cr22-action-kde-0046.png cr32-action-kde-0010.png cr32-action-kde-0042.png cr22-action-kde-0008.png cr32-action-kde-0044.png cr32-action-kde-0017.png cr22-action-kde-0048.png cr22-action-kde-0002.png cr32-action-kde-0018.png cr32-action-kde-0011.png cr32-action-kde-0041.png cr32-action-kde-0001.png cr32-action-kde-0019.png cr32-action-kde-0015.png cr-action-kde-sources.tar.gz cr32-action-kde-0029.png cr32-action-kde-0020.png cr22-action-kde-0006.png cr22-action-kde-0007.png cr22-action-kde-0016.png cr32-action-kde-0030.png cr32-action-kde-0008.png cr22-action-kde-0009.png cr32-action-kde-0003.png cr32-action-kde-0047.png cr22-action-kde-0001.png cr22-action-kde-0027.png cr22-action-kde-0031.png cr32-action-kde-0039.png cr32-action-kde-0021.png cr22-action-kde-0042.png cr32-action-kde-0037.png cr32-action-kde-0031.png cr22-action-kde-0023.png cr22-action-kde-0012.png cr22-action-kde-0004.png cr22-action-kde-0017.png cr32-action-kde-0009.png cr22-action-kde-0020.png cr32-action-kde-0013.png cr22-action-kde-0040.png cr22-action-kde-0003.png cr22-action-kde-0034.png cr22-action-kde-0005.png cr32-action-kde-0012.png cr22-action-kde-0043.png cr32-action-kde-0028.png cr32-action-kde-0016.png cr22-action-kde-0037.png cr22-action-kde-0036.png cr32-action-kde-0022.png cr32-action-kde-0014.png cr22-action-kde-0019.png Makefile.am cr22-action-kde-0029.png cr32-action-kde-0007.png cr32-action-kde-0025.png cr22-action-kde-0035.png cr32-action-kde-0048.png cr22-action-kde-0021.png cr22-action-kde-0022.png cr32-action-kde-0045.png Makefile.in cr32-action-kde-0023.png cr22-action-kde-0030.png cr22-action-kde-0033.png cr32-action-kde-0027.png cr32-action-kde-0006.png cr32-action-kde-0002.png cr22-action-kde-0018.png cr32-action-kde-0036.png cr32-action-kde-0032.png cr22-action-kde-0047.png cr32-action-kde-0040.png cr22-action-kde-0026.png 
- 
- #>+ 2
- docs-am:
 --- pics/emoticons/Makefile.in
 +++ pics/emoticons/Makefile.in
 @@ -1,4 +1,4 @@
@@ -28226,3 +28280,60 @@
  
  #>+ 15
  force-reedit:
+--- pics/Makefile.in
++++ pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -520,7 +521,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*) \
+@@ -558,9 +559,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
+@@ -924,7 +925,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