[Pkg-kde-commits] rev 1004 - branches/kde-3.4.0/packages/kdelibs/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Mon, 18 Apr 2005 20:27:06 +0000
Author: chrsmrtn-guest
Date: 2005-04-18 20:26:59 +0000 (Mon, 18 Apr 2005)
New Revision: 1004
Added:
branches/kde-3.4.0/packages/kdelibs/debian/patches/17_kio_kssl_include_fix.diff
Modified:
branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
SSL build fix. I'll upload fixed packages in a moment.
Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/17_kio_kssl_include_fix.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/17_kio_kssl_include_fix.diff 2005-04-15 08:21:21 UTC (rev 1003)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/17_kio_kssl_include_fix.diff 2005-04-18 20:26:59 UTC (rev 1004)
@@ -0,0 +1,22 @@
+--- kde.orig/kio/kssl/Makefile.am
++++ kde.patched/kio/kssl/Makefile.am
+@@ -3,7 +3,7 @@
+ # somewhere else. Another option for the future (needs testing) would be to
+ # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
+ # instead of #include <openssl/foo.h>
+-INCLUDES=-I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
++INCLUDES=-I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kdecore/network $(all_includes) $(SSL_INCLUDES)
+
+ noinst_LTLIBRARIES = libkssl.la
+ KSSLVERSION= 3.0.0
+--- kde.orig/kio/kssl/Makefile.in
++++ kde.patched/kio/kssl/Makefile.in
+@@ -527,7 +527,7 @@
+ # somewhere else. Another option for the future (needs testing) would be to
+ # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
+ # instead of #include <openssl/foo.h>
+-INCLUDES = -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
++INCLUDES = -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kdecore/network $(all_includes) $(SSL_INCLUDES)
+ noinst_LTLIBRARIES = libkssl.la
+ KSSLVERSION = 3.0.0
+ KSSLPATCH = 0
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-04-15 08:21:21 UTC (rev 1003)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff 2005-04-18 20:26:59 UTC (rev 1004)
@@ -1,132 +1,6 @@
-#DPATCHLEVEL=1
-diff -Nru kdelibs-3.4.0.orig/Makefile.in kdelibs-3.4.0/Makefile.in
---- kdelibs-3.4.0.orig/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/Makefile.in 2005-04-06 13:01:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -276,6 +276,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@
-@@ -528,7 +531,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*) \
-@@ -570,12 +573,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
-@@ -587,7 +590,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 $@
-@@ -629,7 +632,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -641,7 +650,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -649,7 +658,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -670,7 +685,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1269,7 +1284,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:
-@@ -1294,7 +1309,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/acinclude.m4 kdelibs-3.4.0/acinclude.m4
--- kdelibs-3.4.0.orig/acinclude.m4 2005-03-04 08:20:24.000000000 -0500
-+++ kdelibs-3.4.0/acinclude.m4 2005-04-06 12:56:22.000000000 -0400
++++ kdelibs-3.4.0/acinclude.m4 2005-04-18 14:36:19.000000000 -0400
@@ -1644,7 +1644,15 @@
AC_MSG_RESULT([$kde_cv_uic_plugins])
@@ -1661,7 +1535,7 @@
diff -Nru kdelibs-3.4.0.orig/aclocal.m4 kdelibs-3.4.0/aclocal.m4
--- kdelibs-3.4.0.orig/aclocal.m4 2005-03-04 08:20:52.000000000 -0500
-+++ kdelibs-3.4.0/aclocal.m4 2005-04-06 12:57:05.000000000 -0400
++++ kdelibs-3.4.0/aclocal.m4 2005-04-18 14:36:55.000000000 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -2251,122 +2125,9 @@
# _AM_PROG_TAR(FORMAT)
# --------------------
-diff -Nru kdelibs-3.4.0.orig/arts/Makefile.in kdelibs-3.4.0/arts/Makefile.in
---- kdelibs-3.4.0.orig/arts/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/Makefile.in 2005-04-06 13:01:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -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@
-@@ -471,7 +474,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*) \
-@@ -509,9 +512,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:
-@@ -531,7 +534,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -543,7 +552,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -551,7 +560,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -572,7 +587,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -963,7 +978,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in configure.in.in Makefile.am
-+KDE_DIST=configure.in.in Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-@@ -996,7 +1011,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/arts/kde/Makefile.in kdelibs-3.4.0/arts/kde/Makefile.in
--- kdelibs-3.4.0.orig/arts/kde/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/kde/Makefile.in 2005-04-06 13:01:26.000000000 -0400
++++ kdelibs-3.4.0/arts/kde/Makefile.in 2005-04-18 14:39:45.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -2563,7 +2324,7 @@
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in
--- kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in 2005-04-06 13:01:26.000000000 -0400
++++ kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in 2005-04-18 14:39:45.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -2633,7 +2394,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/arts/knotify/Makefile.in kdelibs-3.4.0/arts/knotify/Makefile.in
--- kdelibs-3.4.0.orig/arts/knotify/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/knotify/Makefile.in 2005-04-06 13:01:26.000000000 -0400
++++ kdelibs-3.4.0/arts/knotify/Makefile.in 2005-04-18 14:39:45.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -2701,9 +2462,122 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/arts/Makefile.in kdelibs-3.4.0/arts/Makefile.in
+--- kdelibs-3.4.0.orig/arts/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/arts/Makefile.in 2005-04-18 14:39:45.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -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@
+@@ -471,7 +474,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*) \
+@@ -509,9 +512,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:
+@@ -531,7 +534,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -543,7 +552,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -551,7 +560,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -572,7 +587,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -963,7 +978,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in configure.in.in Makefile.am
++KDE_DIST=configure.in.in Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -996,7 +1011,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/arts/message/Makefile.in kdelibs-3.4.0/arts/message/Makefile.in
--- kdelibs-3.4.0.orig/arts/message/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/message/Makefile.in 2005-04-06 13:01:26.000000000 -0400
++++ kdelibs-3.4.0/arts/message/Makefile.in 2005-04-18 14:39:45.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -2773,7 +2647,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/configure kdelibs-3.4.0/configure
--- kdelibs-3.4.0.orig/configure 2005-03-04 08:23:41.000000000 -0500
-+++ kdelibs-3.4.0/configure 2005-04-06 13:02:19.000000000 -0400
++++ kdelibs-3.4.0/configure 2005-04-18 14:40:07.000000000 -0400
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -9782,7 +9656,7 @@
echo "dnssd will be compiled as stub, without any real functionality."
diff -Nru kdelibs-3.4.0.orig/configure.in kdelibs-3.4.0/configure.in
--- kdelibs-3.4.0.orig/configure.in 2005-03-04 08:20:29.000000000 -0500
-+++ kdelibs-3.4.0/configure.in 2005-04-06 12:56:24.000000000 -0400
++++ kdelibs-3.4.0/configure.in 2005-04-18 14:36:21.000000000 -0400
@@ -23,6 +23,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdelibs, "3.4.0") dnl searches for some needed programs
@@ -9845,263 +9719,9 @@
echo ""
echo "You're missing Apple mDNSResponder 85 or later, therefore"
echo "dnssd will be compiled as stub, without any real functionality."
-diff -Nru kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in
---- kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in 2005-04-06 13:01:26.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,11 +75,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkICE_la_SOURCES)
- DIST_SOURCES = $(libkICE_la_SOURCES)
-@@ -248,6 +248,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@
-@@ -523,7 +526,7 @@
-
- .SUFFIXES:
- .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*) \
-@@ -561,9 +564,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:
-@@ -844,7 +847,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/dcop/Makefile.in kdelibs-3.4.0/dcop/Makefile.in
---- kdelibs-3.4.0.orig/dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/Makefile.in 2005-04-06 13:01:27.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -148,29 +148,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+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) \
-@@ -362,6 +362,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@
-@@ -639,7 +642,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*) \
-@@ -677,9 +680,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
-
- dcop-path.h: stamp-h2
-@@ -691,7 +694,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 $@
-@@ -904,7 +907,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -916,7 +925,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -924,7 +933,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -945,7 +960,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1383,18 +1398,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
-@@ -1426,7 +1441,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
-@@ -1551,8 +1566,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)
-
diff -Nru kdelibs-3.4.0.orig/dcop/client/Makefile.in kdelibs-3.4.0/dcop/client/Makefile.in
--- kdelibs-3.4.0.orig/dcop/client/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/client/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/dcop/client/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10184,7 +9804,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.0/dcop/dcopidl/Makefile.in
--- kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/dcopidl/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/dcop/dcopidl/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10254,7 +9874,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in
--- kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10324,7 +9944,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.0/dcop/dcopidlng/Makefile.in
--- kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/dcopidlng/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/dcop/dcopidlng/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10387,9 +10007,263 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in 2005-04-18 14:39:45.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -75,11 +75,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkICE_la_SOURCES)
+ DIST_SOURCES = $(libkICE_la_SOURCES)
+@@ -248,6 +248,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@
+@@ -523,7 +526,7 @@
+
+ .SUFFIXES:
+ .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*) \
+@@ -561,9 +564,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:
+@@ -844,7 +847,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/dcop/Makefile.in kdelibs-3.4.0/dcop/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/Makefile.in 2005-04-18 14:39:45.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -148,29 +148,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++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) \
+@@ -362,6 +362,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@
+@@ -639,7 +642,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*) \
+@@ -677,9 +680,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
+
+ dcop-path.h: stamp-h2
+@@ -691,7 +694,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 $@
+@@ -904,7 +907,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -916,7 +925,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -924,7 +933,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -945,7 +960,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1383,18 +1398,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
+@@ -1426,7 +1441,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
+@@ -1551,8 +1566,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)
+
diff -Nru kdelibs-3.4.0.orig/dcop/tests/Makefile.in kdelibs-3.4.0/dcop/tests/Makefile.in
--- kdelibs-3.4.0.orig/dcop/tests/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/tests/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/dcop/tests/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10459,7 +10333,7 @@
clean-noinstPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/dnssd/Makefile.in kdelibs-3.4.0/dnssd/Makefile.in
--- kdelibs-3.4.0.orig/dnssd/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dnssd/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/dnssd/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10573,113 +10447,9 @@
@echo 'creating libkdnssd_la.all_cpp.cpp ...'; \
rm -f libkdnssd_la.all_cpp.files libkdnssd_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdnssd_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.0.orig/doc/Makefile.in kdelibs-3.4.0/doc/Makefile.in
---- kdelibs-3.4.0.orig/doc/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/Makefile.in 2005-04-06 13:01:27.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,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*) \
-@@ -507,9 +510,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:
-@@ -529,7 +532,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -817,7 +832,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/doc/common/Makefile.in kdelibs-3.4.0/doc/common/Makefile.in
--- kdelibs-3.4.0.orig/doc/common/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/common/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/doc/common/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10744,7 +10514,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in kdelibs-3.4.0/doc/kdelibs/Makefile.in
--- kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/kdelibs/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/doc/kdelibs/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10800,7 +10570,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/doc/kspell/Makefile.in kdelibs-3.4.0/doc/kspell/Makefile.in
--- kdelibs-3.4.0.orig/doc/kspell/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/kspell/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/doc/kspell/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10854,9 +10624,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/interfaces/Makefile.in kdelibs-3.4.0/interfaces/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/Makefile.in 2005-04-06 13:01:27.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/doc/Makefile.in kdelibs-3.4.0/doc/Makefile.in
+--- kdelibs-3.4.0.orig/doc/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/doc/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -10870,7 +10640,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -231,6 +231,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10880,16 +10650,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -469,7 +472,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*) \
-@@ -510,9 +513,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10901,7 +10671,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -532,7 +535,13 @@
+@@ -529,7 +532,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -10916,7 +10686,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -544,7 +553,7 @@
+@@ -541,7 +550,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10925,7 +10695,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -552,7 +561,13 @@
+@@ -549,7 +558,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -10940,7 +10710,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -573,7 +588,7 @@
+@@ -570,7 +585,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10949,7 +10719,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -997,7 +1012,7 @@
+@@ -817,7 +832,7 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
@@ -10960,7 +10730,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.0/interfaces/khexedit/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/khexedit/Makefile.in 2005-04-06 13:01:27.000000000 -0400
++++ kdelibs-3.4.0/interfaces/khexedit/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11014,9 +10784,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/Makefile.in 2005-04-06 13:01:27.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11030,7 +10800,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -230,6 +230,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11040,8 +10810,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
- all: docs-am all-recursive
+@@ -478,7 +481,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -11049,7 +10819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11061,55 +10831,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -529,7 +532,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -817,7 +832,7 @@
+@@ -794,7 +797,7 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
@@ -11118,9 +10840,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in 2005-04-06 13:01:27.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11134,7 +10856,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -233,6 +233,9 @@
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11144,7 +10866,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -453,7 +456,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11153,7 +10875,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -491,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11165,7 +10887,65 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -794,7 +797,7 @@
+@@ -636,40 +639,40 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-action-presence_online.png cr32-action-presence_away.png cr32-action-presence_unknown.png cr16-action-presence_unknown.png cr32-action-presence_online.png cr16-action-presence_offline.png cr48-action-presence_offline.png Makefile.in cr48-action-presence_online.png cr16-action-presence_away.png Makefile.am cr48-action-presence_away.png cr32-action-presence_offline.png
++KDE_DIST=cr16-action-presence_online.png cr32-action-presence_away.png cr16-action-presence_unknown.png cr32-action-presence_unknown.png cr32-action-presence_online.png cr16-action-presence_offline.png cr48-action-presence_offline.png Makefile.in cr48-action-presence_online.png cr16-action-presence_away.png Makefile.am cr32-action-presence_offline.png cr48-action-presence_away.png
+
+ #>+ 2
+ docs-am:
+
+ #>+ 29
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
++ $(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
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+- $(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_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+ $(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_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)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.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
++ $(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_away.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_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.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_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/32x32/actions/presence_unknown.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/16x16/actions/presence_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
+
+ #>+ 15
+ force-reedit:
+@@ -699,7 +702,7 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
@@ -11176,7 +10956,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11292,9 +11072,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in 2005-04-06 13:01:28.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11308,7 +11088,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -214,6 +214,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11318,8 +11098,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
- all: docs-am all-am
+@@ -469,7 +472,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -11327,7 +11107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11339,65 +11119,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -636,40 +639,40 @@
- .NOEXPORT:
+@@ -529,7 +532,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -541,7 +550,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -549,7 +558,13 @@
- #>+ 2
--KDE_DIST=cr16-action-presence_online.png cr32-action-presence_away.png cr32-action-presence_unknown.png cr16-action-presence_unknown.png cr32-action-presence_online.png cr16-action-presence_offline.png cr48-action-presence_offline.png Makefile.in cr48-action-presence_online.png cr16-action-presence_away.png Makefile.am cr48-action-presence_away.png cr32-action-presence_offline.png
-+KDE_DIST=cr16-action-presence_online.png cr32-action-presence_away.png cr16-action-presence_unknown.png cr32-action-presence_unknown.png cr32-action-presence_online.png cr16-action-presence_offline.png cr48-action-presence_offline.png Makefile.in cr48-action-presence_online.png cr16-action-presence_away.png Makefile.am cr32-action-presence_offline.png cr48-action-presence_away.png
-
- #>+ 2
- docs-am:
-
- #>+ 29
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-+ $(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
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(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_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
- $(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_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)/cr32-action-presence_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_unknown.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
-+ $(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_away.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_offline.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_online.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/presence_unknown.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_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/32x32/actions/presence_unknown.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/16x16/actions/presence_online.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/presence_offline.png
-
- #>+ 15
- force-reedit:
-@@ -699,7 +702,7 @@
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -570,7 +585,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -817,7 +832,7 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
@@ -11408,7 +11178,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/kio/Makefile.in kdelibs-3.4.0/interfaces/kio/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kio/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kio/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/kio/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11462,9 +11232,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in 2005-04-06 13:01:28.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11478,7 +11248,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
+@@ -80,18 +80,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -11499,9 +11269,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmediaplayer_la_SOURCES)
- DIST_SOURCES = $(libkmediaplayer_la_SOURCES)
-@@ -281,6 +281,9 @@
+ SOURCES = $(kfileaudiopreview_la_SOURCES)
+ DIST_SOURCES = $(kfileaudiopreview_la_SOURCES)
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11511,7 +11281,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -508,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11520,7 +11290,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -546,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11530,59 +11300,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -691,7 +694,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -703,7 +712,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -711,7 +720,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -732,7 +747,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-04-06 13:01:28.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11596,7 +11318,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
+@@ -84,18 +84,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -11617,9 +11339,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfileaudiopreview_la_SOURCES)
- DIST_SOURCES = $(kfileaudiopreview_la_SOURCES)
-@@ -260,6 +260,9 @@
+ SOURCES = $(libkmediaplayer_la_SOURCES)
+ DIST_SOURCES = $(libkmediaplayer_la_SOURCES)
+@@ -281,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11629,7 +11351,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -535,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11638,7 +11360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11648,11 +11370,59 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -691,7 +694,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -703,7 +712,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -711,7 +720,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -732,7 +747,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11708,7 +11478,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in kdelibs-3.4.0/interfaces/kscript/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kscript/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/kscript/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11826,7 +11596,7 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11896,7 +11666,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.0/interfaces/kspeech/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kspeech/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/kspeech/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -11952,7 +11722,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12020,9 +11790,113 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/interfaces/Makefile.in kdelibs-3.4.0/interfaces/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/Makefile.in 2005-04-18 14:39:46.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -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@
+@@ -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:
+@@ -532,7 +535,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -544,7 +553,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -552,7 +561,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -573,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -997,7 +1012,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in kdelibs-3.4.0/interfaces/terminal/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/terminal/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/terminal/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12078,7 +11952,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.0/interfaces/terminal/test/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/terminal/test/Makefile.in 2005-04-06 13:01:28.000000000 -0400
++++ kdelibs-3.4.0/interfaces/terminal/test/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12148,7 +12022,7 @@
clean-checkPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/kab/Makefile.in kdelibs-3.4.0/kab/Makefile.in
--- kdelibs-3.4.0.orig/kab/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kab/Makefile.in 2005-04-06 13:01:29.000000000 -0400
++++ kdelibs-3.4.0/kab/Makefile.in 2005-04-18 14:39:46.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12216,9 +12090,79 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+diff -Nru kdelibs-3.4.0.orig/kabc/formats/Makefile.in kdelibs-3.4.0/kabc/formats/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/formats/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/formats/Makefile.in 2005-04-18 14:39:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabcformat_binary_la_SOURCES)
+ DIST_SOURCES = $(kabcformat_binary_la_SOURCES)
+@@ -260,6 +260,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -519,7 +522,7 @@
+
+ .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*) \
+@@ -557,9 +560,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kabc/Makefile.in kdelibs-3.4.0/kabc/Makefile.in
--- kdelibs-3.4.0.orig/kabc/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/Makefile.in 2005-04-06 13:01:29.000000000 -0400
++++ kdelibs-3.4.0/kabc/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12410,183 +12354,9 @@
@echo 'creating libkabc_la.all_cpp.cpp ...'; \
rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.0.orig/kabc/formats/Makefile.in kdelibs-3.4.0/kabc/formats/Makefile.in
---- kdelibs-3.4.0.orig/kabc/formats/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/formats/Makefile.in 2005-04-06 13:01:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kabcformat_binary_la_SOURCES)
- DIST_SOURCES = $(kabcformat_binary_la_SOURCES)
-@@ -260,6 +260,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
-
- .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*) \
-@@ -557,9 +560,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kabc/plugins/Makefile.in kdelibs-3.4.0/kabc/plugins/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/Makefile.in 2005-04-06 13:01:29.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,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*) \
-@@ -507,9 +510,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:
-@@ -529,7 +532,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -821,7 +836,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.0/kabc/plugins/dir/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/dir/Makefile.in 2005-04-06 13:01:29.000000000 -0400
++++ kdelibs-3.4.0/kabc/plugins/dir/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12656,7 +12426,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in 2005-04-06 13:01:29.000000000 -0400
++++ kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12726,7 +12496,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.0/kabc/plugins/file/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/file/Makefile.in 2005-04-06 13:01:29.000000000 -0400
++++ kdelibs-3.4.0/kabc/plugins/file/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12839,7 +12609,7 @@
echo "#define KDE_USE_FINAL 1" >> libkabc_file_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -12907,9 +12677,113 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/Makefile.in kdelibs-3.4.0/kabc/plugins/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/Makefile.in 2005-04-18 14:39:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -230,6 +230,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -469,7 +472,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*) \
+@@ -507,9 +510,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:
+@@ -529,7 +532,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -541,7 +550,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -549,7 +558,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -570,7 +585,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -821,7 +836,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.0/kabc/plugins/net/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/net/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kabc/plugins/net/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13022,7 +12896,7 @@
echo "#define KDE_USE_FINAL 1" >> libkabc_net_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.0/kabc/plugins/sql/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/sql/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kabc/plugins/sql/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13101,7 +12975,7 @@
clean-closures:
diff -Nru kdelibs-3.4.0.orig/kabc/scripts/Makefile.in kdelibs-3.4.0/kabc/scripts/Makefile.in
--- kdelibs-3.4.0.orig/kabc/scripts/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/scripts/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kabc/scripts/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13157,7 +13031,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kabc/vcard/Makefile.in kdelibs-3.4.0/kabc/vcard/Makefile.in
--- kdelibs-3.4.0.orig/kabc/vcard/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/vcard/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kabc/vcard/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13236,7 +13110,7 @@
docs-am:
diff -Nru kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.0/kabc/vcardparser/Makefile.in
--- kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/vcardparser/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kabc/vcardparser/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13304,113 +13178,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.0.orig/kate/Makefile.in kdelibs-3.4.0/kate/Makefile.in
---- kdelibs-3.4.0.orig/kate/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kate/Makefile.in 2005-04-06 13:01:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -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:
-@@ -533,7 +536,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -545,7 +554,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -553,7 +562,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -574,7 +589,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1003,7 +1018,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kate/data/Makefile.in kdelibs-3.4.0/kate/data/Makefile.in
--- kdelibs-3.4.0.orig/kate/data/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kate/data/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kate/data/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13475,7 +13245,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kate/interfaces/Makefile.in kdelibs-3.4.0/kate/interfaces/Makefile.in
--- kdelibs-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kate/interfaces/Makefile.in 2005-04-06 13:01:30.000000000 -0400
++++ kdelibs-3.4.0/kate/interfaces/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13543,9 +13313,113 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kate/Makefile.in kdelibs-3.4.0/kate/Makefile.in
+--- kdelibs-3.4.0.orig/kate/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kate/Makefile.in 2005-04-18 14:39:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -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:
+@@ -533,7 +536,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -545,7 +554,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -553,7 +562,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -574,7 +589,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1003,7 +1018,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kate/part/Makefile.in kdelibs-3.4.0/kate/part/Makefile.in
--- kdelibs-3.4.0.orig/kate/part/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/part/Makefile.in 2005-04-06 13:01:32.000000000 -0400
++++ kdelibs-3.4.0/kate/part/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13710,113 +13584,9 @@
@echo 'creating libkatepart_la.all_cpp.cpp ...'; \
rm -f libkatepart_la.all_cpp.files libkatepart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkatepart_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.0.orig/kate/plugins/Makefile.in kdelibs-3.4.0/kate/plugins/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/Makefile.in 2005-04-06 13:01:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,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*) \
-@@ -507,9 +510,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:
-@@ -529,7 +532,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -817,7 +832,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13886,7 +13656,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -13956,7 +13726,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.0/kate/plugins/isearch/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/isearch/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kate/plugins/isearch/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14026,7 +13796,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14094,9 +13864,113 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/Makefile.in kdelibs-3.4.0/kate/plugins/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/Makefile.in 2005-04-18 14:39:47.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -230,6 +230,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -469,7 +472,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*) \
+@@ -507,9 +510,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:
+@@ -529,7 +532,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -541,7 +550,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -549,7 +558,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -570,7 +585,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14166,7 +14040,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kcert/Makefile.in kdelibs-3.4.0/kcert/Makefile.in
--- kdelibs-3.4.0.orig/kcert/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kcert/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kcert/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14236,7 +14110,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kcmshell/Makefile.in kdelibs-3.4.0/kcmshell/Makefile.in
--- kdelibs-3.4.0.orig/kcmshell/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kcmshell/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kcmshell/Makefile.in 2005-04-18 14:39:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14306,7 +14180,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kconf_update/Makefile.in kdelibs-3.4.0/kconf_update/Makefile.in
--- kdelibs-3.4.0.orig/kconf_update/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kconf_update/Makefile.in 2005-04-06 13:01:33.000000000 -0400
++++ kdelibs-3.4.0/kconf_update/Makefile.in 2005-04-18 14:39:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14374,9 +14248,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kdecore/Makefile.in kdelibs-3.4.0/kdecore/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/Makefile.in 2005-04-06 13:01:36.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in 2005-04-18 14:39:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14390,20 +14264,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -206,29 +206,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -91,18 +91,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -14424,9 +14285,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+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) \
-@@ -418,6 +418,9 @@
+ SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
+ $(kconfig_compiler_SOURCES)
+@@ -286,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14436,16 +14297,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -793,7 +796,7 @@
+@@ -544,7 +547,7 @@
.SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -831,9 +834,9 @@
+@@ -582,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14455,18 +14316,9 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- kdemacros.h: stamp-h3
-@@ -845,7 +848,7 @@
- stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
- @rm -f stamp-h3
- cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
--$(srcdir)/kdemacros.h.in: $(am__configure_deps)
-+$(srcdir)/kdemacros.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h3
- touch $@
-@@ -1167,7 +1170,13 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -680,7 +683,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -14481,7 +14333,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1179,7 +1188,7 @@
+@@ -692,7 +701,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -14490,7 +14342,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1187,7 +1196,13 @@
+@@ -700,7 +709,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -14505,7 +14357,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1208,7 +1223,7 @@
+@@ -721,7 +736,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -14514,77 +14366,88 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1797,18 +1812,18 @@
- mocs: kclipboard.moc
+diff -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in 2005-04-18 14:39:48.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
- #>+ 3
--kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
-- $(MOC) $(srcdir)/kconfigdialogmanager.h -o kconfigdialogmanager.moc
-+kprocctrl.moc: $(srcdir)/kprocctrl.h
-+ $(MOC) $(srcdir)/kprocctrl.h -o kprocctrl.moc
-
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -138,18 +138,18 @@
#>+ 2
--mocs: kconfigdialogmanager.moc
-+mocs: kprocctrl.moc
-
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 3
--kprocctrl.moc: $(srcdir)/kprocctrl.h
-- $(MOC) $(srcdir)/kprocctrl.h -o kprocctrl.moc
-+kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
-+ $(MOC) $(srcdir)/kconfigdialogmanager.h -o kconfigdialogmanager.moc
-
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
#>+ 2
--mocs: kprocctrl.moc
-+mocs: kconfigdialogmanager.moc
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) \
+ $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) \
+@@ -321,6 +321,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@
+@@ -599,7 +602,7 @@
- #>+ 3
- kmanagerselection.moc: $(srcdir)/kmanagerselection.h
-@@ -1846,18 +1861,18 @@
- mocs: ksock.moc
+ .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*) \
+@@ -637,9 +640,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- #>+ 3
--kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
-- $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
-+kprocess.moc: $(srcdir)/kprocess.h
-+ $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
+-$(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
- #>+ 2
--mocs: kglobalaccel_win.moc
-+mocs: kprocess.moc
+ clean-checkPROGRAMS:
+@@ -974,7 +977,7 @@
+ .NOEXPORT:
- #>+ 3
--kprocess.moc: $(srcdir)/kprocess.h
-- $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
-+kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
-+ $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
-
#>+ 2
--mocs: kprocess.moc
-+mocs: kglobalaccel_win.moc
+-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
- #>+ 3
- kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
-@@ -1924,7 +1939,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kconfigdialogmanager.moc kprocctrl.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kglobalaccel_win.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
-+ -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
-
#>+ 2
- KDE_DIST=README.kiosk standard_weak.nmcheck libkdecore_weak.nmcheck Makefile.in README.exec kglobalaccel_mac.h netsupp_win32.cpp libkdecore.nmcheck kappdcopiface.h DESIGN.iconloading kglobalaccel_win.cpp README.user_profiles 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
-@@ -1982,7 +1997,7 @@
-
-
- #>+ 11
--libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kprocctrl.moc kconfigdialogmanager.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
-+libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kconfigdialogmanager.moc kprocctrl.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
- @echo 'creating libkdecore_la.all_cpp.cpp ...'; \
- rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in 2005-04-06 13:01:36.000000000 -0400
+ docs-am:
+diff -Nru kdelibs-3.4.0.orig/kdecore/Makefile.in kdelibs-3.4.0/kdecore/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/Makefile.in 2005-04-18 14:39:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14598,7 +14461,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -91,18 +91,18 @@
+@@ -206,29 +206,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -14619,9 +14495,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
- $(kconfig_compiler_SOURCES)
-@@ -286,6 +286,9 @@
+ SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) \
+ $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) \
+@@ -418,6 +418,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14631,16 +14507,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -793,7 +796,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .c .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -831,9 +834,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14650,9 +14526,18 @@
-$(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)
-@@ -680,7 +683,13 @@
+
+ kdemacros.h: stamp-h3
+@@ -845,7 +848,7 @@
+ stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
+ @rm -f stamp-h3
+ cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
+-$(srcdir)/kdemacros.h.in: $(am__configure_deps)
++$(srcdir)/kdemacros.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h3
+ touch $@
+@@ -1167,7 +1170,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -14667,7 +14552,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -692,7 +701,7 @@
+@@ -1179,7 +1188,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -14676,7 +14561,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -700,7 +709,13 @@
+@@ -1187,7 +1196,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -14691,7 +14576,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -721,7 +736,7 @@
+@@ -1208,7 +1223,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -14700,88 +14585,77 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in 2005-04-06 13:01:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
+@@ -1797,18 +1812,18 @@
+ mocs: kclipboard.moc
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -138,18 +138,18 @@
+ #>+ 3
+-kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
+- $(MOC) $(srcdir)/kconfigdialogmanager.h -o kconfigdialogmanager.moc
++kprocctrl.moc: $(srcdir)/kprocctrl.h
++ $(MOC) $(srcdir)/kprocctrl.h -o kprocctrl.moc
+
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+-mocs: kconfigdialogmanager.moc
++mocs: kprocctrl.moc
+
#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-kprocctrl.moc: $(srcdir)/kprocctrl.h
+- $(MOC) $(srcdir)/kprocctrl.h -o kprocctrl.moc
++kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
++ $(MOC) $(srcdir)/kconfigdialogmanager.h -o kconfigdialogmanager.moc
+
#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) \
- $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) \
-@@ -321,6 +321,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@
-@@ -599,7 +602,7 @@
+-mocs: kprocctrl.moc
++mocs: kconfigdialogmanager.moc
- .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*) \
-@@ -637,9 +640,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+ kmanagerselection.moc: $(srcdir)/kmanagerselection.h
+@@ -1846,18 +1861,18 @@
+ mocs: ksock.moc
--$(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
+ #>+ 3
+-kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
+- $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
++kprocess.moc: $(srcdir)/kprocess.h
++ $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
- clean-checkPROGRAMS:
-@@ -974,7 +977,7 @@
- .NOEXPORT:
+ #>+ 2
+-mocs: kglobalaccel_win.moc
++mocs: kprocess.moc
+ #>+ 3
+-kprocess.moc: $(srcdir)/kprocess.h
+- $(MOC) $(srcdir)/kprocess.h -o kprocess.moc
++kglobalaccel_win.moc: $(srcdir)/kglobalaccel_win.h
++ $(MOC) $(srcdir)/kglobalaccel_win.h -o kglobalaccel_win.moc
+
#>+ 2
--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
+-mocs: kprocess.moc
++mocs: kglobalaccel_win.moc
+ #>+ 3
+ kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
+@@ -1924,7 +1939,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kconfigdialogmanager.moc kprocctrl.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kglobalaccel_win.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
++ -rm -f kmultipledrag.moc ksimpleconfig.moc kglobalaccel.moc kwinmodule.moc kshortcutmenu.moc kprocio.moc kapplication.moc kconfig.moc kconfigbase.moc kextsock.moc kaudioplayer.moc kstartupinfo.moc kaccelmanager_private.moc kasyncio.moc kclipboard.moc kprocctrl.moc kconfigdialogmanager.moc kmanagerselection.moc ksockaddr.moc kglobalaccel_x11.moc kbufferedio.moc ksock.moc kprocess.moc kglobalaccel_win.moc kuniqueapplication.moc kaccel.moc kcompletion.moc kcheckaccelerators.moc klibloader.moc kdesktopfile.moc ksycoca.moc kaccelprivate.moc kxmessages.moc
+
#>+ 2
- docs-am:
+ 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
+@@ -1982,7 +1997,7 @@
+
+
+ #>+ 11
+-libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kprocctrl.moc kconfigdialogmanager.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
++libkdecore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/libintl.cpp $(srcdir)/kapplication.cpp $(srcdir)/kdebug.cpp $(srcdir)/netwm.cpp $(srcdir)/kconfigbase.cpp $(srcdir)/kconfig.cpp $(srcdir)/ksimpleconfig.cpp $(srcdir)/kconfigbackend.cpp $(srcdir)/kmanagerselection.cpp $(srcdir)/kdesktopfile.cpp $(srcdir)/kstandarddirs.cpp $(srcdir)/ksock.cpp $(srcdir)/kpty.cpp $(srcdir)/kprocess.cpp $(srcdir)/kprocctrl.cpp $(srcdir)/klocale.cpp $(srcdir)/krfcdate.cpp $(srcdir)/kiconeffect.cpp $(srcdir)/kicontheme.cpp $(srcdir)/kiconloader.cpp $(srcdir)/kwin.cpp $(srcdir)/kwinmodule.cpp $(srcdir)/krootprop.cpp $(srcdir)/kcharsets.cpp kentities.c $(srcdir)/kckey.cpp $(srcdir)/kshortcut.cpp $(srcdir)/kkeynative_x11.cpp $(srcdir)/kkeyserver_x11.cpp $(srcdir)/kaccelaction.cpp $(srcdir)/kshortcutmenu.cpp $(srcdir)/kaccelbase.cpp $(srcdir)/kaccel.cpp $(srcdir)/kglobalaccel_x11.cpp $(srcdir)/kglobalaccel.cpp $(srcdir)/kstdaccel.cpp $(srcdir)/kshortcutlist.cpp $(srcdir)/kcrash.cpp $(srcdir)/kurl.cpp $(srcdir)/kregexp.cpp $(srcdir)/kglobal.cpp $(srcdir)/kglobalsettings.cpp $(srcdir)/kallocator.cpp $(srcdir)/kvmallocator.cpp $(srcdir)/kmimesourcefactory.cpp $(srcdir)/kinstance.cpp $(srcdir)/kpalette.cpp $(srcdir)/kipc.cpp $(srcdir)/klibloader.cpp $(srcdir)/ktempfile.cpp $(srcdir)/kuniqueapplication.cpp $(srcdir)/kaccelmanager.cpp $(srcdir)/ksavefile.cpp $(srcdir)/krandomsequence.cpp $(srcdir)/kstringhandler.cpp $(srcdir)/kcompletion.cpp $(srcdir)/kcmdlineargs.cpp $(srcdir)/kaboutdata.cpp $(srcdir)/kcompletionbase.cpp $(srcdir)/knotifyclient.cpp $(srcdir)/kaudioplayer.cpp $(srcdir)/kdcoppropertyproxy.cpp $(srcdir)/ksockaddr.cpp $(srcdir)/kextsock.cpp $(srcdir)/netsupp.cpp $(srcdir)/kprocio.cpp $(srcdir)/kbufferedio.cpp $(srcdir)/kpixmapprovider.cpp $(srcdir)/kurldrag.cpp $(srcdir)/kmdcodec.cpp $(srcdir)/ksocks.cpp $(srcdir)/ksycoca.cpp $(srcdir)/ksycocadict.cpp $(srcdir)/ksycocafactory.cpp $(srcdir)/kxmessages.cpp $(srcdir)/kstartupinfo.cpp $(srcdir)/kcatalogue.cpp $(srcdir)/kasyncio.cpp $(srcdir)/kmultipledrag.cpp $(srcdir)/kstaticdeleter.cpp $(srcdir)/kappdcopiface.cpp $(srcdir)/kclipboard.cpp $(srcdir)/kcheckaccelerators.cpp $(srcdir)/kdeversion.cpp $(srcdir)/kdebugdcopiface.cpp $(srcdir)/kcalendarsystem.cpp $(srcdir)/kcalendarsystemgregorian.cpp $(srcdir)/kcalendarsystemhijri.cpp $(srcdir)/kcalendarsystemhebrew.cpp $(srcdir)/kcalendarsystemfactory.cpp $(srcdir)/kmacroexpander.cpp $(srcdir)/kidna.cpp $(srcdir)/ktempdir.cpp $(srcdir)/kshell.cpp $(srcdir)/kmountpoint.cpp $(srcdir)/kcalendarsystemjalali.cpp $(srcdir)/kprotocolinfo_kdecore.cpp $(srcdir)/kprotocolinfofactory.cpp $(srcdir)/kxerrorhandler.cpp $(srcdir)/kuser.cpp $(srcdir)/kconfigskeleton.cpp $(srcdir)/kconfigdialogmanager.cpp $(srcdir)/klockfile.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp kextsock.moc kaudioplayer.moc kmultipledrag.moc kstartupinfo.moc kaccelmanager_private.moc ksimpleconfig.moc kglobalaccel.moc kasyncio.moc kconfigdialogmanager.moc kprocctrl.moc kclipboard.moc kwinmodule.moc ksockaddr.moc kmanagerselection.moc kshortcutmenu.moc kglobalaccel_x11.moc kprocio.moc kapplication.moc ksock.moc kbufferedio.moc kconfig.moc kprocess.moc kuniqueapplication.moc kaccel.moc kcheckaccelerators.moc kcompletion.moc klibloader.moc kconfigbase.moc ksycoca.moc kdesktopfile.moc kaccelprivate.moc kxmessages.moc
+ @echo 'creating libkdecore_la.all_cpp.cpp ...'; \
+ rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in kdelibs-3.4.0/kdecore/malloc/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/malloc/Makefile.in 2005-04-06 13:01:36.000000000 -0400
++++ kdelibs-3.4.0/kdecore/malloc/Makefile.in 2005-04-18 14:39:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14851,7 +14725,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kdecore/network/Makefile.in kdelibs-3.4.0/kdecore/network/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/network/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/network/Makefile.in 2005-04-06 13:01:36.000000000 -0400
++++ kdelibs-3.4.0/kdecore/network/Makefile.in 2005-04-18 14:39:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -14999,7 +14873,7 @@
kclientsocketbase.lo: kclientsocketbase.moc
diff -Nru kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.0/kdecore/svgicons/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/svgicons/Makefile.in 2005-04-06 13:01:36.000000000 -0400
++++ kdelibs-3.4.0/kdecore/svgicons/Makefile.in 2005-04-18 14:39:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -15069,7 +14943,7 @@
clean-noinstLTLIBRARIES:
diff -Nru kdelibs-3.4.0.orig/kdecore/tests/Makefile.in kdelibs-3.4.0/kdecore/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/tests/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/tests/Makefile.in 2005-04-06 13:01:37.000000000 -0400
++++ kdelibs-3.4.0/kdecore/tests/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -15173,7 +15047,7 @@
KDE_DIST=Makefile.in Makefile.am
diff -Nru kdelibs-3.4.0.orig/kded/Makefile.in kdelibs-3.4.0/kded/Makefile.in
--- kdelibs-3.4.0.orig/kded/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kded/Makefile.in 2005-04-06 13:01:38.000000000 -0400
++++ kdelibs-3.4.0/kded/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -15277,7 +15151,7 @@
KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am
diff -Nru kdelibs-3.4.0.orig/kded/test/Makefile.in kdelibs-3.4.0/kded/test/Makefile.in
--- kdelibs-3.4.0.orig/kded/test/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kded/test/Makefile.in 2005-04-06 13:01:38.000000000 -0400
++++ kdelibs-3.4.0/kded/test/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -15347,7 +15221,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdefx/Makefile.in kdelibs-3.4.0/kdefx/Makefile.in
--- kdelibs-3.4.0.orig/kdefx/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kdefx/Makefile.in 2005-04-06 13:01:38.000000000 -0400
++++ kdelibs-3.4.0/kdefx/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -15415,458 +15289,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kdeprint/Makefile.in kdelibs-3.4.0/kdeprint/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:23:13.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/Makefile.in 2005-04-06 13:01:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -123,29 +123,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) \
- $(libkdeprint_la_SOURCES)
-@@ -340,6 +340,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@
-@@ -662,7 +665,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*) \
-@@ -700,9 +703,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:
-@@ -1010,7 +1013,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1022,7 +1031,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1030,7 +1039,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1051,7 +1066,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1583,18 +1598,18 @@
- mocs: plugincombobox.moc
-
- #>+ 3
--kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
-- $(MOC) $(srcdir)/kpgeneralpage.h -o kpgeneralpage.moc
-+driverview.moc: $(srcdir)/driverview.h
-+ $(MOC) $(srcdir)/driverview.h -o driverview.moc
-
- #>+ 2
--mocs: kpgeneralpage.moc
-+mocs: driverview.moc
-
- #>+ 3
--driverview.moc: $(srcdir)/driverview.h
-- $(MOC) $(srcdir)/driverview.h -o driverview.moc
-+kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
-+ $(MOC) $(srcdir)/kpgeneralpage.h -o kpgeneralpage.moc
-
- #>+ 2
--mocs: driverview.moc
-+mocs: kpgeneralpage.moc
-
- #>+ 3
- kdeprintd.moc: $(srcdir)/kdeprintd.h
-@@ -1611,18 +1626,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
-@@ -1639,18 +1654,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
-@@ -1688,18 +1703,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
-@@ -1710,7 +1725,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f posterpreview.moc kprintdialog.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc kpgeneralpage.moc driverview.moc kdeprintd.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
-diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in kdelibs-3.4.0/kdeprint/cups/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in 2005-03-04 08:23:14.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/cups/Makefile.in 2005-04-06 13:01:40.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -116,29 +116,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
- $(make_driver_db_cups_SOURCES)
-@@ -326,6 +326,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@
-@@ -601,7 +604,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*) \
-@@ -639,9 +642,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)
-@@ -843,7 +846,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -855,7 +864,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -863,7 +872,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -884,7 +899,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1154,18 +1169,18 @@
- mocs: kpimagepage.moc
-
- #>+ 3
--kmwquota.moc: $(srcdir)/kmwquota.h
-- $(MOC) $(srcdir)/kmwquota.h -o kmwquota.moc
-+kmcupsjobmanager.moc: $(srcdir)/kmcupsjobmanager.h
-+ $(MOC) $(srcdir)/kmcupsjobmanager.h -o kmcupsjobmanager.moc
-
- #>+ 2
--mocs: kmwquota.moc
-+mocs: kmcupsjobmanager.moc
-
- #>+ 3
--kmcupsjobmanager.moc: $(srcdir)/kmcupsjobmanager.h
-- $(MOC) $(srcdir)/kmcupsjobmanager.h -o kmcupsjobmanager.moc
-+kmwquota.moc: $(srcdir)/kmwquota.h
-+ $(MOC) $(srcdir)/kmwquota.h -o kmwquota.moc
-
- #>+ 2
--mocs: kmcupsjobmanager.moc
-+mocs: kmwquota.moc
-
- #>+ 3
- kmwippprinter.moc: $(srcdir)/kmwippprinter.h
-@@ -1182,18 +1197,18 @@
- mocs: kmwusers.moc
-
- #>+ 3
--kptextpage.moc: $(srcdir)/kptextpage.h
-- $(MOC) $(srcdir)/kptextpage.h -o kptextpage.moc
-+ippreportdlg.moc: $(srcdir)/ippreportdlg.h
-+ $(MOC) $(srcdir)/ippreportdlg.h -o ippreportdlg.moc
-
- #>+ 2
--mocs: kptextpage.moc
-+mocs: ippreportdlg.moc
-
- #>+ 3
--ippreportdlg.moc: $(srcdir)/ippreportdlg.h
-- $(MOC) $(srcdir)/ippreportdlg.h -o ippreportdlg.moc
-+kptextpage.moc: $(srcdir)/kptextpage.h
-+ $(MOC) $(srcdir)/kptextpage.h -o kptextpage.moc
-
- #>+ 2
--mocs: ippreportdlg.moc
-+mocs: kptextpage.moc
-
- #>+ 3
- kmcupsmanager.moc: $(srcdir)/kmcupsmanager.h
-@@ -1211,7 +1226,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kmwother.moc kpschedulepage.moc kpimagepage.moc kmwquota.moc kmcupsjobmanager.moc kmwippprinter.moc kmwusers.moc kptextpage.moc ippreportdlg.moc kmcupsmanager.moc cupsaddsmb2.moc
-+ -rm -f kmwother.moc kpschedulepage.moc kpimagepage.moc kmcupsjobmanager.moc kmwquota.moc kmwippprinter.moc kmwusers.moc ippreportdlg.moc kptextpage.moc kmcupsmanager.moc cupsaddsmb2.moc
-
- #>+ 2
- KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am
-@@ -1262,7 +1277,7 @@
-
-
- #>+ 11
--kdeprint_cups_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsinfos.cpp $(srcdir)/ipprequest.cpp $(srcdir)/kmcupsfactory.cpp $(srcdir)/kmcupsjobmanager.cpp $(srcdir)/kmcupsmanager.cpp $(srcdir)/kmcupsuimanager.cpp $(srcdir)/kmpropbanners.cpp $(srcdir)/kmwbanners.cpp $(srcdir)/kmwipp.cpp $(srcdir)/kmwippselect.cpp $(srcdir)/kcupsprinterimpl.cpp $(srcdir)/kmcupsconfigwidget.cpp $(srcdir)/kmconfigcups.cpp $(srcdir)/kmconfigcupsdir.cpp $(srcdir)/kmwippprinter.cpp $(srcdir)/kmwfax.cpp $(srcdir)/kmwquota.cpp $(srcdir)/kmpropquota.cpp $(srcdir)/kmwusers.cpp $(srcdir)/kmpropusers.cpp $(srcdir)/kpschedulepage.cpp $(srcdir)/image.cpp $(srcdir)/imagepreview.cpp $(srcdir)/imageposition.cpp $(srcdir)/kpimagepage.cpp $(srcdir)/kptextpage.cpp $(srcdir)/kphpgl2page.cpp $(srcdir)/cupsaddsmb2.cpp $(srcdir)/kmwother.cpp $(srcdir)/ippreportdlg.cpp $(srcdir)/kptagspage.cpp kmwother.moc kpschedulepage.moc kpimagepage.moc kmcupsjobmanager.moc kmwquota.moc kmwippprinter.moc kmwusers.moc ippreportdlg.moc kptextpage.moc kmcupsmanager.moc cupsaddsmb2.moc
-+kdeprint_cups_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsinfos.cpp $(srcdir)/ipprequest.cpp $(srcdir)/kmcupsfactory.cpp $(srcdir)/kmcupsjobmanager.cpp $(srcdir)/kmcupsmanager.cpp $(srcdir)/kmcupsuimanager.cpp $(srcdir)/kmpropbanners.cpp $(srcdir)/kmwbanners.cpp $(srcdir)/kmwipp.cpp $(srcdir)/kmwippselect.cpp $(srcdir)/kcupsprinterimpl.cpp $(srcdir)/kmcupsconfigwidget.cpp $(srcdir)/kmconfigcups.cpp $(srcdir)/kmconfigcupsdir.cpp $(srcdir)/kmwippprinter.cpp $(srcdir)/kmwfax.cpp $(srcdir)/kmwquota.cpp $(srcdir)/kmpropquota.cpp $(srcdir)/kmwusers.cpp $(srcdir)/kmpropusers.cpp $(srcdir)/kpschedulepage.cpp $(srcdir)/image.cpp $(srcdir)/imagepreview.cpp $(srcdir)/imageposition.cpp $(srcdir)/kpimagepage.cpp $(srcdir)/kptextpage.cpp $(srcdir)/kphpgl2page.cpp $(srcdir)/cupsaddsmb2.cpp $(srcdir)/kmwother.cpp $(srcdir)/ippreportdlg.cpp $(srcdir)/kptagspage.cpp kmwother.moc kpschedulepage.moc kpimagepage.moc kmwquota.moc kmcupsjobmanager.moc kmwippprinter.moc kmwusers.moc kptextpage.moc ippreportdlg.moc kmcupsmanager.moc cupsaddsmb2.moc
- @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; \
-@@ -1305,8 +1320,8 @@
- cupsaddsmb2.o: cupsaddsmb2.moc
- kmwusers.lo: kmwusers.moc
- kpschedulepage.lo: kpschedulepage.moc
--ippreportdlg.o: ippreportdlg.moc
- kptextpage.o: kptextpage.moc
-+ippreportdlg.o: ippreportdlg.moc
- kmwippprinter.o: kmwippprinter.moc
- kptextpage.lo: kptextpage.moc
- kmwippprinter.lo: kmwippprinter.moc
diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in 2005-03-04 08:23:14.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in 2005-04-06 13:01:40.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -15994,7 +15419,7 @@
KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cups_logo.png findnewopts.sh Makefile.am
diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16184,9 +15609,218 @@
-cupsdserverpage.o: cupsdserverpage.moc
cupsdnetworkpage.lo: cupsdnetworkpage.moc
+cupsdserverpage.o: cupsdserverpage.moc
+diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in kdelibs-3.4.0/kdeprint/cups/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in 2005-03-04 08:23:14.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/Makefile.in 2005-04-18 14:39:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -116,29 +116,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
+ $(make_driver_db_cups_SOURCES)
+@@ -326,6 +326,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@
+@@ -601,7 +604,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*) \
+@@ -639,9 +642,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)
+@@ -843,7 +846,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -855,7 +864,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -863,7 +872,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -884,7 +899,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1154,18 +1169,18 @@
+ mocs: kpimagepage.moc
+
+ #>+ 3
+-kmwquota.moc: $(srcdir)/kmwquota.h
+- $(MOC) $(srcdir)/kmwquota.h -o kmwquota.moc
++kmcupsjobmanager.moc: $(srcdir)/kmcupsjobmanager.h
++ $(MOC) $(srcdir)/kmcupsjobmanager.h -o kmcupsjobmanager.moc
+
+ #>+ 2
+-mocs: kmwquota.moc
++mocs: kmcupsjobmanager.moc
+
+ #>+ 3
+-kmcupsjobmanager.moc: $(srcdir)/kmcupsjobmanager.h
+- $(MOC) $(srcdir)/kmcupsjobmanager.h -o kmcupsjobmanager.moc
++kmwquota.moc: $(srcdir)/kmwquota.h
++ $(MOC) $(srcdir)/kmwquota.h -o kmwquota.moc
+
+ #>+ 2
+-mocs: kmcupsjobmanager.moc
++mocs: kmwquota.moc
+
+ #>+ 3
+ kmwippprinter.moc: $(srcdir)/kmwippprinter.h
+@@ -1182,18 +1197,18 @@
+ mocs: kmwusers.moc
+
+ #>+ 3
+-kptextpage.moc: $(srcdir)/kptextpage.h
+- $(MOC) $(srcdir)/kptextpage.h -o kptextpage.moc
++ippreportdlg.moc: $(srcdir)/ippreportdlg.h
++ $(MOC) $(srcdir)/ippreportdlg.h -o ippreportdlg.moc
+
+ #>+ 2
+-mocs: kptextpage.moc
++mocs: ippreportdlg.moc
+
+ #>+ 3
+-ippreportdlg.moc: $(srcdir)/ippreportdlg.h
+- $(MOC) $(srcdir)/ippreportdlg.h -o ippreportdlg.moc
++kptextpage.moc: $(srcdir)/kptextpage.h
++ $(MOC) $(srcdir)/kptextpage.h -o kptextpage.moc
+
+ #>+ 2
+-mocs: ippreportdlg.moc
++mocs: kptextpage.moc
+
+ #>+ 3
+ kmcupsmanager.moc: $(srcdir)/kmcupsmanager.h
+@@ -1211,7 +1226,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kmwother.moc kpschedulepage.moc kpimagepage.moc kmwquota.moc kmcupsjobmanager.moc kmwippprinter.moc kmwusers.moc kptextpage.moc ippreportdlg.moc kmcupsmanager.moc cupsaddsmb2.moc
++ -rm -f kmwother.moc kpschedulepage.moc kpimagepage.moc kmcupsjobmanager.moc kmwquota.moc kmwippprinter.moc kmwusers.moc ippreportdlg.moc kptextpage.moc kmcupsmanager.moc cupsaddsmb2.moc
+
+ #>+ 2
+ KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am
+@@ -1262,7 +1277,7 @@
+
+
+ #>+ 11
+-kdeprint_cups_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsinfos.cpp $(srcdir)/ipprequest.cpp $(srcdir)/kmcupsfactory.cpp $(srcdir)/kmcupsjobmanager.cpp $(srcdir)/kmcupsmanager.cpp $(srcdir)/kmcupsuimanager.cpp $(srcdir)/kmpropbanners.cpp $(srcdir)/kmwbanners.cpp $(srcdir)/kmwipp.cpp $(srcdir)/kmwippselect.cpp $(srcdir)/kcupsprinterimpl.cpp $(srcdir)/kmcupsconfigwidget.cpp $(srcdir)/kmconfigcups.cpp $(srcdir)/kmconfigcupsdir.cpp $(srcdir)/kmwippprinter.cpp $(srcdir)/kmwfax.cpp $(srcdir)/kmwquota.cpp $(srcdir)/kmpropquota.cpp $(srcdir)/kmwusers.cpp $(srcdir)/kmpropusers.cpp $(srcdir)/kpschedulepage.cpp $(srcdir)/image.cpp $(srcdir)/imagepreview.cpp $(srcdir)/imageposition.cpp $(srcdir)/kpimagepage.cpp $(srcdir)/kptextpage.cpp $(srcdir)/kphpgl2page.cpp $(srcdir)/cupsaddsmb2.cpp $(srcdir)/kmwother.cpp $(srcdir)/ippreportdlg.cpp $(srcdir)/kptagspage.cpp kmwother.moc kpschedulepage.moc kpimagepage.moc kmcupsjobmanager.moc kmwquota.moc kmwippprinter.moc kmwusers.moc ippreportdlg.moc kptextpage.moc kmcupsmanager.moc cupsaddsmb2.moc
++kdeprint_cups_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cupsinfos.cpp $(srcdir)/ipprequest.cpp $(srcdir)/kmcupsfactory.cpp $(srcdir)/kmcupsjobmanager.cpp $(srcdir)/kmcupsmanager.cpp $(srcdir)/kmcupsuimanager.cpp $(srcdir)/kmpropbanners.cpp $(srcdir)/kmwbanners.cpp $(srcdir)/kmwipp.cpp $(srcdir)/kmwippselect.cpp $(srcdir)/kcupsprinterimpl.cpp $(srcdir)/kmcupsconfigwidget.cpp $(srcdir)/kmconfigcups.cpp $(srcdir)/kmconfigcupsdir.cpp $(srcdir)/kmwippprinter.cpp $(srcdir)/kmwfax.cpp $(srcdir)/kmwquota.cpp $(srcdir)/kmpropquota.cpp $(srcdir)/kmwusers.cpp $(srcdir)/kmpropusers.cpp $(srcdir)/kpschedulepage.cpp $(srcdir)/image.cpp $(srcdir)/imagepreview.cpp $(srcdir)/imageposition.cpp $(srcdir)/kpimagepage.cpp $(srcdir)/kptextpage.cpp $(srcdir)/kphpgl2page.cpp $(srcdir)/cupsaddsmb2.cpp $(srcdir)/kmwother.cpp $(srcdir)/ippreportdlg.cpp $(srcdir)/kptagspage.cpp kmwother.moc kpschedulepage.moc kpimagepage.moc kmwquota.moc kmcupsjobmanager.moc kmwippprinter.moc kmwusers.moc kptextpage.moc ippreportdlg.moc kmcupsmanager.moc cupsaddsmb2.moc
+ @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; \
+@@ -1305,8 +1320,8 @@
+ cupsaddsmb2.o: cupsaddsmb2.moc
+ kmwusers.lo: kmwusers.moc
+ kpschedulepage.lo: kpschedulepage.moc
+-ippreportdlg.o: ippreportdlg.moc
+ kptextpage.o: kptextpage.moc
++ippreportdlg.o: ippreportdlg.moc
+ kmwippprinter.o: kmwippprinter.moc
+ kptextpage.lo: kptextpage.moc
+ kmwippprinter.lo: kmwippprinter.moc
diff -Nru kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in kdelibs-3.4.0/kdeprint/ext/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/ext/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/ext/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16256,7 +15890,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in kdelibs-3.4.0/kdeprint/filters/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/filters/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/filters/Makefile.in 2005-04-18 14:39:49.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16312,7 +15946,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.0/kdeprint/foomatic/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/foomatic/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/foomatic/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16395,7 +16029,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.0/kdeprint/lpd/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/lpd/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/lpd/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16478,7 +16112,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16548,7 +16182,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.0/kdeprint/lpr/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/lpr/Makefile.in 2005-04-06 13:01:41.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/lpr/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16629,9 +16263,249 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kdeprint/Makefile.in kdelibs-3.4.0/kdeprint/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:23:13.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/Makefile.in 2005-04-18 14:39:49.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -123,29 +123,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) \
+ $(libkdeprint_la_SOURCES)
+@@ -340,6 +340,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@
+@@ -662,7 +665,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*) \
+@@ -700,9 +703,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:
+@@ -1010,7 +1013,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1022,7 +1031,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -1030,7 +1039,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1051,7 +1066,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1583,18 +1598,18 @@
+ mocs: plugincombobox.moc
+
+ #>+ 3
+-kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
+- $(MOC) $(srcdir)/kpgeneralpage.h -o kpgeneralpage.moc
++driverview.moc: $(srcdir)/driverview.h
++ $(MOC) $(srcdir)/driverview.h -o driverview.moc
+
+ #>+ 2
+-mocs: kpgeneralpage.moc
++mocs: driverview.moc
+
+ #>+ 3
+-driverview.moc: $(srcdir)/driverview.h
+- $(MOC) $(srcdir)/driverview.h -o driverview.moc
++kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
++ $(MOC) $(srcdir)/kpgeneralpage.h -o kpgeneralpage.moc
+
+ #>+ 2
+-mocs: driverview.moc
++mocs: kpgeneralpage.moc
+
+ #>+ 3
+ kdeprintd.moc: $(srcdir)/kdeprintd.h
+@@ -1611,18 +1626,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
+@@ -1639,18 +1654,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
+@@ -1688,18 +1703,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
+@@ -1710,7 +1725,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f posterpreview.moc kprintdialog.moc marginpreview.moc kpposterpage.moc kmjobmanager.moc kpcopiespage.moc messagewindow.moc plugincombobox.moc kpgeneralpage.moc driverview.moc kdeprintd.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
diff -Nru kdelibs-3.4.0.orig/kdeprint/management/Makefile.in kdelibs-3.4.0/kdeprint/management/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/management/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/management/Makefile.in 2005-04-06 13:01:42.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/management/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -16936,7 +16810,7 @@
kmwclass.o: kmwclass.moc
diff -Nru kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in kdelibs-3.4.0/kdeprint/pics/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/pics/Makefile.in 2005-04-06 13:01:42.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/pics/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -17220,7 +17094,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.0/kdeprint/rlpr/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/rlpr/Makefile.in 2005-04-06 13:01:42.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/rlpr/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -17290,7 +17164,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in kdelibs-3.4.0/kdeprint/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/tests/Makefile.in 2005-04-06 13:01:42.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/tests/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -17358,9 +17232,79 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+diff -Nru kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in 2005-04-18 14:39:50.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+@@ -263,6 +263,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@
+@@ -513,7 +516,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*) \
+@@ -551,9 +554,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)
diff -Nru kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in kdelibs-3.4.0/kdeprint/tools/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/tools/Makefile.in 2005-04-06 13:01:42.000000000 -0400
++++ kdelibs-3.4.0/kdeprint/tools/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -17462,9 +17406,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in 2005-04-06 13:01:42.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kdesu/Makefile.in kdelibs-3.4.0/kdesu/Makefile.in
+--- kdelibs-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdesu/Makefile.in 2005-04-18 14:39:50.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -17478,7 +17422,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
+@@ -90,29 +90,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17499,9 +17456,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
- DIST_SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
-@@ -263,6 +263,9 @@
+ SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+ DIST_SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+@@ -282,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17511,16 +17468,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -535,7 +538,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*) \
-@@ -551,9 +554,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17530,11 +17487,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kdesu/Makefile.in kdelibs-3.4.0/kdesu/Makefile.in
---- kdelibs-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdesu/Makefile.in 2005-04-06 13:01:42.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kdeui/about/Makefile.in kdelibs-3.4.0/kdeui/about/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/about/Makefile.in 2005-03-04 08:23:20.000000000 -0500
++++ kdelibs-3.4.0/kdeui/about/Makefile.in 2005-04-18 14:39:51.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -17548,20 +17505,119 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -90,29 +90,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -224,6 +224,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@
+@@ -471,7 +474,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*) \
+@@ -509,9 +512,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:
+@@ -704,7 +707,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/kdeui/colors/Makefile.in kdelibs-3.4.0/kdeui/colors/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/colors/Makefile.in 2005-03-04 08:23:20.000000000 -0500
++++ kdelibs-3.4.0/kdeui/colors/Makefile.in 2005-04-18 14:39:51.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -214,6 +214,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -452,7 +455,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*) \
+@@ -490,9 +493,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:
+@@ -673,7 +676,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in 2005-04-18 14:39:51.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -83,18 +83,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17582,9 +17638,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
- DIST_SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
-@@ -282,6 +282,9 @@
+ SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+ DIST_SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+@@ -265,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17594,16 +17650,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -515,7 +518,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*) \
-@@ -573,9 +576,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17613,11 +17669,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kdeui/Makefile.in kdelibs-3.4.0/kdeui/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/Makefile.in 2005-03-04 08:23:20.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/Makefile.in 2005-04-06 13:01:47.000000000 -0400
++++ kdelibs-3.4.0/kdeui/Makefile.in 2005-04-18 14:39:51.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18111,191 +18167,9 @@
@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.0.orig/kdeui/about/Makefile.in kdelibs-3.4.0/kdeui/about/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/about/Makefile.in 2005-03-04 08:23:20.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/about/Makefile.in 2005-04-06 13:01:47.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -224,6 +224,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@
-@@ -471,7 +474,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*) \
-@@ -509,9 +512,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:
-@@ -704,7 +707,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kdeui/colors/Makefile.in kdelibs-3.4.0/kdeui/colors/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/colors/Makefile.in 2005-03-04 08:23:20.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/colors/Makefile.in 2005-04-06 13:01:47.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -214,6 +214,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,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*) \
-@@ -490,9 +493,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:
-@@ -673,7 +676,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in 2005-04-06 13:01:47.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kdetrayproxy_la_SOURCES)
- DIST_SOURCES = $(kded_kdetrayproxy_la_SOURCES)
-@@ -265,6 +265,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@
-@@ -515,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*) \
-@@ -553,9 +556,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)
diff -Nru kdelibs-3.4.0.orig/kdeui/tests/Makefile.in kdelibs-3.4.0/kdeui/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/tests/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/tests/Makefile.in 2005-04-06 13:01:48.000000000 -0400
++++ kdelibs-3.4.0/kdeui/tests/Makefile.in 2005-04-18 14:39:52.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18462,7 +18336,7 @@
kdocktest.o: kdocktest.moc
diff -Nru kdelibs-3.4.0.orig/kdewidgets/Makefile.in kdelibs-3.4.0/kdewidgets/Makefile.in
--- kdelibs-3.4.0.orig/kdewidgets/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdewidgets/Makefile.in 2005-04-06 13:01:48.000000000 -0400
++++ kdelibs-3.4.0/kdewidgets/Makefile.in 2005-04-18 14:39:52.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18580,7 +18454,7 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.0/kdewidgets/pics/Makefile.in
--- kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdewidgets/pics/Makefile.in 2005-04-06 13:01:48.000000000 -0400
++++ kdelibs-3.4.0/kdewidgets/pics/Makefile.in 2005-04-18 14:39:52.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18645,7 +18519,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.0/kdewidgets/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdewidgets/tests/Makefile.in 2005-04-06 13:01:48.000000000 -0400
++++ kdelibs-3.4.0/kdewidgets/tests/Makefile.in 2005-04-18 14:39:52.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18701,7 +18575,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kdoctools/Makefile.in kdelibs-3.4.0/kdoctools/Makefile.in
--- kdelibs-3.4.0.orig/kdoctools/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdoctools/Makefile.in 2005-04-06 13:01:48.000000000 -0400
++++ kdelibs-3.4.0/kdoctools/Makefile.in 2005-04-18 14:39:52.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18769,9 +18643,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -Nru kdelibs-3.4.0.orig/khtml/Makefile.in kdelibs-3.4.0/khtml/Makefile.in
---- kdelibs-3.4.0.orig/khtml/Makefile.in 2005-03-04 08:23:24.000000000 -0500
-+++ kdelibs-3.4.0/khtml/Makefile.in 2005-04-06 13:01:51.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/khtml/css/Makefile.in kdelibs-3.4.0/khtml/css/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/css/Makefile.in 2005-03-04 08:23:24.000000000 -0500
++++ kdelibs-3.4.0/khtml/css/Makefile.in 2005-04-18 14:39:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18785,7 +18659,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -158,18 +158,18 @@
+@@ -96,18 +96,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -18806,9 +18680,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) \
- $(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) \
-@@ -361,6 +361,9 @@
+ SOURCES = $(libkhtmlcss_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlcss_la_SOURCES)
+@@ -285,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18818,16 +18692,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -675,7 +678,7 @@
+@@ -550,7 +553,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -713,9 +716,9 @@
+@@ -588,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18837,59 +18711,20 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -937,7 +940,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -949,7 +958,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -957,7 +966,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -978,7 +993,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdelibs-3.4.0.orig/khtml/css/Makefile.in kdelibs-3.4.0/khtml/css/Makefile.in
---- kdelibs-3.4.0.orig/khtml/css/Makefile.in 2005-03-04 08:23:24.000000000 -0500
-+++ kdelibs-3.4.0/khtml/css/Makefile.in 2005-04-06 13:01:51.000000000 -0400
+ clean-noinstLTLIBRARIES:
+@@ -858,7 +861,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp tokenizer.flex makevalues quirks.css cssproperties.h cssvalues.h cssproperties.in cssproperties.c makeprop Makefile.am
++KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp makevalues tokenizer.flex quirks.css cssproperties.h cssvalues.h cssproperties.c cssproperties.in makeprop Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -Nru kdelibs-3.4.0.orig/khtml/dom/Makefile.in kdelibs-3.4.0/khtml/dom/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/dom/Makefile.in 2005-03-04 08:23:24.000000000 -0500
++++ kdelibs-3.4.0/khtml/dom/Makefile.in 2005-04-18 14:39:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18903,7 +18738,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,18 +96,18 @@
+@@ -103,18 +103,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -18924,9 +18759,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlcss_la_SOURCES)
- DIST_SOURCES = $(libkhtmlcss_la_SOURCES)
-@@ -285,6 +285,9 @@
+ SOURCES = $(libkhtmldom_la_SOURCES)
+ DIST_SOURCES = $(libkhtmldom_la_SOURCES)
+@@ -291,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18936,7 +18771,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -561,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18945,7 +18780,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18957,18 +18792,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -858,7 +861,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp tokenizer.flex makevalues quirks.css cssproperties.h cssvalues.h cssproperties.in cssproperties.c makeprop Makefile.am
-+KDE_DIST=css_extensionsimpl.cpp cssvalues.in html4.css Makefile.in cssvalues.c tokenizer.cpp makevalues tokenizer.flex quirks.css cssproperties.h cssvalues.h cssproperties.c cssproperties.in makeprop Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdelibs-3.4.0.orig/khtml/dom/Makefile.in kdelibs-3.4.0/khtml/dom/Makefile.in
---- kdelibs-3.4.0.orig/khtml/dom/Makefile.in 2005-03-04 08:23:24.000000000 -0500
-+++ kdelibs-3.4.0/khtml/dom/Makefile.in 2005-04-06 13:01:53.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/khtml/ecma/Makefile.in kdelibs-3.4.0/khtml/ecma/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/ecma/Makefile.in 2005-03-04 08:23:26.000000000 -0500
++++ kdelibs-3.4.0/khtml/ecma/Makefile.in 2005-04-18 14:39:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -18982,7 +18808,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -103,18 +103,18 @@
+@@ -98,18 +98,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -19003,9 +18829,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmldom_la_SOURCES)
- DIST_SOURCES = $(libkhtmldom_la_SOURCES)
-@@ -291,6 +291,9 @@
+ SOURCES = $(libkjs_html_la_SOURCES)
+ DIST_SOURCES = $(libkjs_html_la_SOURCES)
+@@ -278,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19015,7 +18841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -538,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19024,7 +18850,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19036,9 +18862,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.0.orig/khtml/ecma/Makefile.in kdelibs-3.4.0/khtml/ecma/Makefile.in
---- kdelibs-3.4.0.orig/khtml/ecma/Makefile.in 2005-03-04 08:23:26.000000000 -0500
-+++ kdelibs-3.4.0/khtml/ecma/Makefile.in 2005-04-06 13:01:54.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/khtml/html/Makefile.in kdelibs-3.4.0/khtml/html/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/html/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/html/Makefile.in 2005-04-18 14:39:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19052,7 +18878,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -98,18 +98,18 @@
+@@ -99,18 +99,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -19073,9 +18899,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkjs_html_la_SOURCES)
- DIST_SOURCES = $(libkjs_html_la_SOURCES)
-@@ -278,6 +278,9 @@
+ SOURCES = $(libkhtmlhtml_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlhtml_la_SOURCES)
+@@ -279,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19085,7 +18911,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -543,7 +546,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19094,7 +18920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19106,9 +18932,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdelibs-3.4.0.orig/khtml/html/Makefile.in kdelibs-3.4.0/khtml/html/Makefile.in
---- kdelibs-3.4.0.orig/khtml/html/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/html/Makefile.in 2005-04-06 13:01:54.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.0/khtml/java/dummy/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/dummy/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19122,7 +18948,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -99,18 +99,18 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -19143,9 +18969,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkhtmlhtml_la_SOURCES)
- DIST_SOURCES = $(libkhtmlhtml_la_SOURCES)
-@@ -279,6 +279,9 @@
+ SOURCES = $(libkjava_la_SOURCES)
+ DIST_SOURCES = $(libkjava_la_SOURCES)
+@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19155,7 +18981,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -496,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19164,7 +18990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -534,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19174,11 +19000,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/khtml/java/Makefile.in kdelibs-3.4.0/khtml/java/Makefile.in
--- kdelibs-3.4.0.orig/khtml/java/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/java/Makefile.in 2005-04-06 13:01:54.000000000 -0400
++++ kdelibs-3.4.0/khtml/java/Makefile.in 2005-04-18 14:39:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19346,9 +19172,9 @@
@echo 'creating libkjava_la.all_cpp.cpp ...'; \
rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
-diff -Nru kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.0/khtml/java/dummy/Makefile.in
---- kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/java/dummy/Makefile.in 2005-04-06 13:01:54.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in kdelibs-3.4.0/khtml/java/tests/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/tests/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19362,7 +19188,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
+@@ -66,18 +66,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -19383,9 +19209,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkjava_la_SOURCES)
- DIST_SOURCES = $(libkjava_la_SOURCES)
-@@ -254,6 +254,9 @@
+ SOURCES = $(testserver_SOURCES)
+ DIST_SOURCES = $(testserver_SOURCES)
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19395,7 +19221,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -490,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19404,7 +19230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -528,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19414,11 +19240,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in kdelibs-3.4.0/khtml/java/tests/Makefile.in
---- kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/java/tests/Makefile.in 2005-04-06 13:01:54.000000000 -0400
+
+ clean-checkPROGRAMS:
+diff -Nru kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.0/khtml/kmultipart/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/kmultipart/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19432,7 +19258,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
+@@ -77,18 +77,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -19453,9 +19279,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(testserver_SOURCES)
- DIST_SOURCES = $(testserver_SOURCES)
-@@ -245,6 +245,9 @@
+ SOURCES = $(libkmultipart_la_SOURCES)
+ DIST_SOURCES = $(libkmultipart_la_SOURCES)
+@@ -258,6 +258,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19465,7 +19291,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -512,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19474,7 +19300,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19484,11 +19310,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.0/khtml/kmultipart/Makefile.in
---- kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/kmultipart/Makefile.in 2005-04-06 13:01:54.000000000 -0400
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/khtml/Makefile.in kdelibs-3.4.0/khtml/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/Makefile.in 2005-03-04 08:23:24.000000000 -0500
++++ kdelibs-3.4.0/khtml/Makefile.in 2005-04-18 14:39:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19502,7 +19328,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
+@@ -158,18 +158,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -19523,9 +19349,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmultipart_la_SOURCES)
- DIST_SOURCES = $(libkmultipart_la_SOURCES)
-@@ -258,6 +258,9 @@
+ SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) \
+ $(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) \
+@@ -361,6 +361,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19535,16 +19361,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -675,7 +678,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*) \
-@@ -550,9 +553,9 @@
+@@ -713,9 +716,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19556,9 +19382,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -937,7 +940,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -949,7 +958,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -957,7 +966,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -978,7 +993,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/khtml/misc/Makefile.in kdelibs-3.4.0/khtml/misc/Makefile.in
--- kdelibs-3.4.0.orig/khtml/misc/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/misc/Makefile.in 2005-04-06 13:01:54.000000000 -0400
++++ kdelibs-3.4.0/khtml/misc/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19628,7 +19502,7 @@
clean-noinstLTLIBRARIES:
diff -Nru kdelibs-3.4.0.orig/khtml/pics/Makefile.in kdelibs-3.4.0/khtml/pics/Makefile.in
--- kdelibs-3.4.0.orig/khtml/pics/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/pics/Makefile.in 2005-04-06 13:01:55.000000000 -0400
++++ kdelibs-3.4.0/khtml/pics/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19747,7 +19621,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/khtml/rendering/Makefile.in kdelibs-3.4.0/khtml/rendering/Makefile.in
--- kdelibs-3.4.0.orig/khtml/rendering/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/khtml/rendering/Makefile.in 2005-04-06 13:01:55.000000000 -0400
++++ kdelibs-3.4.0/khtml/rendering/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19869,7 +19743,7 @@
render_layer.lo: render_layer.moc
diff -Nru kdelibs-3.4.0.orig/khtml/xml/Makefile.in kdelibs-3.4.0/khtml/xml/Makefile.in
--- kdelibs-3.4.0.orig/khtml/xml/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/khtml/xml/Makefile.in 2005-04-06 13:01:56.000000000 -0400
++++ kdelibs-3.4.0/khtml/xml/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -19939,7 +19813,7 @@
clean-noinstLTLIBRARIES:
diff -Nru kdelibs-3.4.0.orig/kimgio/Makefile.in kdelibs-3.4.0/kimgio/Makefile.in
--- kdelibs-3.4.0.orig/kimgio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kimgio/Makefile.in 2005-04-06 13:01:56.000000000 -0400
++++ kdelibs-3.4.0/kimgio/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20009,7 +19883,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kinit/Makefile.in kdelibs-3.4.0/kinit/Makefile.in
--- kdelibs-3.4.0.orig/kinit/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kinit/Makefile.in 2005-04-06 13:01:56.000000000 -0400
++++ kdelibs-3.4.0/kinit/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20140,7 +20014,7 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/kinit/tests/Makefile.in kdelibs-3.4.0/kinit/tests/Makefile.in
--- kdelibs-3.4.0.orig/kinit/tests/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kinit/tests/Makefile.in 2005-04-06 13:01:56.000000000 -0400
++++ kdelibs-3.4.0/kinit/tests/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20208,127 +20082,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.0.orig/kio/Makefile.in kdelibs-3.4.0/kio/Makefile.in
---- kdelibs-3.4.0.orig/kio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kio/Makefile.in 2005-04-06 13:01:56.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -106,18 +106,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkio_la_SOURCES)
- DIST_SOURCES = $(libkio_la_SOURCES)
-@@ -307,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@
-@@ -580,7 +583,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*) \
-@@ -618,9 +621,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)
-@@ -822,7 +825,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -834,7 +843,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -842,7 +851,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -863,7 +878,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in kdelibs-3.4.0/kio/bookmarks/Makefile.in
--- kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kio/bookmarks/Makefile.in 2005-04-06 13:01:56.000000000 -0400
++++ kdelibs-3.4.0/kio/bookmarks/Makefile.in 2005-04-18 14:39:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20398,7 +20154,7 @@
clean-noinstLTLIBRARIES:
diff -Nru kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in kdelibs-3.4.0/kio/httpfilter/Makefile.in
--- kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in 2005-03-04 08:23:29.000000000 -0500
-+++ kdelibs-3.4.0/kio/httpfilter/Makefile.in 2005-04-06 13:01:56.000000000 -0400
++++ kdelibs-3.4.0/kio/httpfilter/Makefile.in 2005-04-18 14:39:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20468,7 +20224,7 @@
clean-noinstLTLIBRARIES:
diff -Nru kdelibs-3.4.0.orig/kio/kfile/Makefile.in kdelibs-3.4.0/kio/kfile/Makefile.in
--- kdelibs-3.4.0.orig/kio/kfile/Makefile.in 2005-03-04 08:23:31.000000000 -0500
-+++ kdelibs-3.4.0/kio/kfile/Makefile.in 2005-04-06 13:01:58.000000000 -0400
++++ kdelibs-3.4.0/kio/kfile/Makefile.in 2005-04-18 14:39:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20700,7 +20456,7 @@
echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.0/kio/kfile/tests/Makefile.in
--- kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in 2005-03-04 08:23:31.000000000 -0500
-+++ kdelibs-3.4.0/kio/kfile/tests/Makefile.in 2005-04-06 13:01:59.000000000 -0400
++++ kdelibs-3.4.0/kio/kfile/tests/Makefile.in 2005-04-18 14:39:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -20770,7 +20526,7 @@
clean-checkPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/kio/kio/Makefile.in kdelibs-3.4.0/kio/kio/Makefile.in
--- kdelibs-3.4.0.orig/kio/kio/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kio/Makefile.in 2005-04-06 13:02:03.000000000 -0400
++++ kdelibs-3.4.0/kio/kio/Makefile.in 2005-04-18 14:39:57.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21090,7 +20846,7 @@
$(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h
diff -Nru kdelibs-3.4.0.orig/kio/kioexec/Makefile.in kdelibs-3.4.0/kio/kioexec/Makefile.in
--- kdelibs-3.4.0.orig/kio/kioexec/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kioexec/Makefile.in 2005-04-06 13:02:03.000000000 -0400
++++ kdelibs-3.4.0/kio/kioexec/Makefile.in 2005-04-18 14:39:57.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21160,7 +20916,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.0/kio/kpasswdserver/Makefile.in
--- kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kpasswdserver/Makefile.in 2005-04-06 13:02:03.000000000 -0400
++++ kdelibs-3.4.0/kio/kpasswdserver/Makefile.in 2005-04-18 14:39:57.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21228,9 +20984,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kio/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/Makefile.in
---- kdelibs-3.4.0.orig/kio/kssl/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kssl/Makefile.in 2005-04-06 13:02:03.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21244,30 +21000,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkssl_la_SOURCES)
- DIST_SOURCES = $(libkssl_la_SOURCES)
-@@ -288,6 +288,9 @@
+@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21277,16 +21010,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -464,7 +467,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*) \
-@@ -659,9 +662,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21297,67 +21030,19 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- ksslconfig.h: stamp-h4
-@@ -673,7 +676,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 $@
-@@ -777,7 +780,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -789,7 +798,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -797,7 +806,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -818,7 +833,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ mostlyclean-libtool:
+@@ -697,7 +700,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/Makefile.in
--- kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/kssl/kssl/Makefile.in 2005-04-06 13:02:03.000000000 -0400
++++ kdelibs-3.4.0/kio/kssl/kssl/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21459,9 +21144,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in
---- kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in 2005-04-06 13:02:03.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kio/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kssl/Makefile.in 2005-03-04 08:23:33.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/Makefile.in 2005-04-18 14:40:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21475,7 +21160,30 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -224,6 +224,9 @@
+@@ -86,18 +86,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkssl_la_SOURCES)
+ DIST_SOURCES = $(libkssl_la_SOURCES)
+@@ -288,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21485,16 +21193,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
- all: docs-am all-am
+@@ -621,7 +624,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*) \
-@@ -502,9 +505,9 @@
+@@ -659,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21505,19 +21213,67 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-@@ -697,7 +700,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kio/misc/Makefile.in kdelibs-3.4.0/kio/misc/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/Makefile.in 2005-04-06 13:02:03.000000000 -0400
+ ksslconfig.h: stamp-h4
+@@ -673,7 +676,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 $@
+@@ -777,7 +780,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -789,7 +798,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -797,7 +806,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -818,7 +833,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nru kdelibs-3.4.0.orig/kio/Makefile.in kdelibs-3.4.0/kio/Makefile.in
+--- kdelibs-3.4.0.orig/kio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/kio/Makefile.in 2005-04-18 14:39:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21531,7 +21287,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -127,18 +127,18 @@
+@@ -106,18 +106,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21552,9 +21308,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+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)
-@@ -330,6 +330,9 @@
+ SOURCES = $(libkio_la_SOURCES)
+ DIST_SOURCES = $(libkio_la_SOURCES)
+@@ -307,6 +307,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21564,16 +21320,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(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*) \
-@@ -638,9 +641,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21583,9 +21339,9 @@
-$(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)
-@@ -851,7 +854,13 @@
+@@ -822,7 +825,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -21600,7 +21356,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -863,7 +872,7 @@
+@@ -834,7 +843,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21609,7 +21365,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -871,7 +880,13 @@
+@@ -842,7 +851,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -21624,7 +21380,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -892,7 +907,7 @@
+@@ -863,7 +878,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21635,7 +21391,7 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in 2005-04-06 13:02:03.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21705,7 +21461,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.0/kio/misc/kfile/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kfile/Makefile.in 2005-04-06 13:02:04.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/kfile/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21775,7 +21531,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.0/kio/misc/kntlm/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kntlm/Makefile.in 2005-04-06 13:02:04.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/kntlm/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21845,7 +21601,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.0/kio/misc/kpac/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kpac/Makefile.in 2005-04-06 13:02:04.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/kpac/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -21967,7 +21723,7 @@
echo "#define KDE_USE_FINAL 1" >> kded_proxyscout_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in 2005-04-06 13:02:04.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22037,7 +21793,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.0/kio/misc/kssld/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kssld/Makefile.in 2005-04-06 13:02:04.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/kssld/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22107,7 +21863,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in 2005-04-06 13:02:04.000000000 -0400
++++ kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22175,9 +21931,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kio/pics/Makefile.in kdelibs-3.4.0/kio/pics/Makefile.in
---- kdelibs-3.4.0.orig/kio/pics/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/pics/Makefile.in 2005-04-06 13:02:04.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kio/misc/Makefile.in kdelibs-3.4.0/kio/misc/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22191,63 +21947,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -214,6 +214,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,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*) \
-@@ -492,9 +495,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:
-@@ -678,7 +681,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kio/tests/Makefile.in kdelibs-3.4.0/kio/tests/Makefile.in
---- kdelibs-3.4.0.orig/kio/tests/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/tests/Makefile.in 2005-04-06 13:02:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -283,18 +283,18 @@
+@@ -127,18 +127,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22268,9 +21968,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
- $(jobtest_SOURCES) $(kclipboardtest_SOURCES) \
-@@ -492,6 +492,9 @@
+ SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+ $(ktelnetservice_SOURCES)
+@@ -330,6 +330,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22280,7 +21980,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -766,7 +769,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22289,7 +21989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -804,9 +807,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22299,56 +21999,9 @@
-$(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kioslave/Makefile.in kdelibs-3.4.0/kioslave/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/Makefile.in 2005-04-06 13:02:04.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -248,6 +248,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@
-@@ -488,7 +491,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*) \
-@@ -526,9 +529,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:
-@@ -548,7 +551,13 @@
+@@ -851,7 +854,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -22363,7 +22016,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -560,7 +569,7 @@
+@@ -863,7 +872,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22372,7 +22025,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -568,7 +577,13 @@
+@@ -871,7 +880,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -22387,7 +22040,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -589,7 +604,7 @@
+@@ -892,7 +907,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22396,7 +22049,54 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -838,7 +853,7 @@
+diff -Nru kdelibs-3.4.0.orig/kio/pics/Makefile.in kdelibs-3.4.0/kio/pics/Makefile.in
+--- kdelibs-3.4.0.orig/kio/pics/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/pics/Makefile.in 2005-04-18 14:39:58.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -214,6 +214,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -454,7 +457,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*) \
+@@ -492,9 +495,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:
+@@ -678,7 +681,7 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
@@ -22405,9 +22105,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.0/kioslave/bzip2/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/bzip2/Makefile.in 2005-04-06 13:02:04.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kio/tests/Makefile.in kdelibs-3.4.0/kio/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kio/tests/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/tests/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22421,7 +22121,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
+@@ -283,18 +283,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22442,9 +22142,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kbzip2filter_la_SOURCES)
- DIST_SOURCES = $(kbzip2filter_la_SOURCES)
-@@ -260,6 +260,9 @@
+ SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
+ $(jobtest_SOURCES) $(kclipboardtest_SOURCES) \
+@@ -492,6 +492,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22454,7 +22154,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -766,7 +769,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22463,7 +22163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -804,9 +807,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22473,11 +22173,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kioslave/file/Makefile.in kdelibs-3.4.0/kioslave/file/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/file/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/file/Makefile.in 2005-04-06 13:02:04.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.0/kioslave/bzip2/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/bzip2/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22491,7 +22191,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
+@@ -79,18 +79,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22512,9 +22212,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_file_la_SOURCES)
- DIST_SOURCES = $(kio_file_la_SOURCES)
-@@ -263,6 +263,9 @@
+ SOURCES = $(kbzip2filter_la_SOURCES)
+ DIST_SOURCES = $(kbzip2filter_la_SOURCES)
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22524,16 +22224,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -506,7 +509,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -544,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22545,9 +22245,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in kdelibs-3.4.0/kioslave/ftp/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/ftp/Makefile.in 2005-04-06 13:02:04.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kioslave/file/Makefile.in kdelibs-3.4.0/kioslave/file/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/file/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/file/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22582,9 +22282,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_ftp_la_SOURCES)
- DIST_SOURCES = $(kio_ftp_la_SOURCES)
-@@ -262,6 +262,9 @@
+ SOURCES = $(kio_file_la_SOURCES)
+ DIST_SOURCES = $(kio_file_la_SOURCES)
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22594,7 +22294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22603,7 +22303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22615,9 +22315,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in kdelibs-3.4.0/kioslave/gzip/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/gzip/Makefile.in 2005-04-06 13:02:04.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in kdelibs-3.4.0/kioslave/ftp/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/ftp/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22631,7 +22331,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
+@@ -80,18 +80,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22652,9 +22352,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kgzipfilter_la_SOURCES)
- DIST_SOURCES = $(kgzipfilter_la_SOURCES)
-@@ -260,6 +260,9 @@
+ SOURCES = $(kio_ftp_la_SOURCES)
+ DIST_SOURCES = $(kio_ftp_la_SOURCES)
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22664,16 +22364,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -511,7 +514,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -549,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22685,9 +22385,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kioslave/http/Makefile.in kdelibs-3.4.0/kioslave/http/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/http/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/http/Makefile.in 2005-04-06 13:02:06.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in kdelibs-3.4.0/kioslave/gzip/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/gzip/Makefile.in 2005-04-18 14:39:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22701,7 +22401,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,18 +108,18 @@
+@@ -79,18 +79,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22722,9 +22422,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+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)
- #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
-@@ -308,6 +308,9 @@
+ SOURCES = $(kgzipfilter_la_SOURCES)
+ DIST_SOURCES = $(kgzipfilter_la_SOURCES)
+@@ -260,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22734,16 +22434,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -507,7 +510,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -545,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22755,57 +22455,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -813,7 +816,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -825,7 +834,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -833,7 +842,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -854,7 +869,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in 2005-04-06 13:02:06.000000000 -0400
++++ kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in 2005-04-18 14:39:59.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -22973,7 +22625,7 @@
+kcookiewin.o: kcookiewin.moc
diff -Nru kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in 2005-04-06 13:02:06.000000000 -0400
++++ kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in 2005-04-18 14:39:59.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23041,9 +22693,231 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+diff -Nru kdelibs-3.4.0.orig/kioslave/http/Makefile.in kdelibs-3.4.0/kioslave/http/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/http/Makefile.in 2005-03-04 08:23:35.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/Makefile.in 2005-04-18 14:39:59.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -108,18 +108,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++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)
+ #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
+@@ -308,6 +308,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@
+@@ -569,7 +572,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*) \
+@@ -607,9 +610,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)
+@@ -813,7 +816,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -825,7 +834,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -833,7 +842,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -854,7 +869,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nru kdelibs-3.4.0.orig/kioslave/Makefile.in kdelibs-3.4.0/kioslave/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/Makefile.in 2005-04-18 14:39:58.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -248,6 +248,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@
+@@ -488,7 +491,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*) \
+@@ -526,9 +529,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:
+@@ -548,7 +551,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -560,7 +569,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -568,7 +577,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -589,7 +604,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -838,7 +853,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.0/kioslave/metainfo/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/metainfo/Makefile.in 2005-04-06 13:02:06.000000000 -0400
++++ kdelibs-3.4.0/kioslave/metainfo/Makefile.in 2005-04-18 14:39:59.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23113,7 +22987,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kjs/Makefile.in kdelibs-3.4.0/kjs/Makefile.in
--- kdelibs-3.4.0.orig/kjs/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kjs/Makefile.in 2005-04-06 13:02:06.000000000 -0400
++++ kdelibs-3.4.0/kjs/Makefile.in 2005-04-18 14:39:59.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23181,9 +23055,79 @@
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)/$@
+diff -Nru kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.0/kmdi/kmdi/Makefile.in
+--- kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kmdi/kmdi/Makefile.in 2005-04-18 14:40:00.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkmdi2_la_SOURCES)
+ DIST_SOURCES = $(libkmdi2_la_SOURCES)
+@@ -265,6 +265,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@
+@@ -512,7 +515,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*) \
+@@ -550,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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kmdi/Makefile.in kdelibs-3.4.0/kmdi/Makefile.in
--- kdelibs-3.4.0.orig/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kmdi/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kmdi/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23338,79 +23282,9 @@
@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; \
-diff -Nru kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.0/kmdi/kmdi/Makefile.in
---- kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kmdi/kmdi/Makefile.in 2005-04-06 13:02:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkmdi2_la_SOURCES)
- DIST_SOURCES = $(libkmdi2_la_SOURCES)
-@@ -265,6 +265,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@
-@@ -512,7 +515,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*) \
-@@ -550,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-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kmdi/test/Makefile.in kdelibs-3.4.0/kmdi/test/Makefile.in
--- kdelibs-3.4.0.orig/kmdi/test/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kmdi/test/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kmdi/test/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23480,7 +23354,7 @@
clean-checkPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/knewstuff/Makefile.in kdelibs-3.4.0/knewstuff/Makefile.in
--- kdelibs-3.4.0.orig/knewstuff/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/knewstuff/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/knewstuff/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23613,7 +23487,7 @@
echo "#define KDE_USE_FINAL 1" >> libknewstuff_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kparts/Makefile.in kdelibs-3.4.0/kparts/Makefile.in
--- kdelibs-3.4.0.orig/kparts/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kparts/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kparts/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23726,7 +23600,7 @@
echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
diff -Nru kdelibs-3.4.0.orig/kparts/tests/Makefile.in kdelibs-3.4.0/kparts/tests/Makefile.in
--- kdelibs-3.4.0.orig/kparts/tests/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kparts/tests/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kparts/tests/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23796,7 +23670,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kresources/Makefile.in kdelibs-3.4.0/kresources/Makefile.in
--- kdelibs-3.4.0.orig/kresources/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kresources/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kresources/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -23900,7 +23774,7 @@
KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am
diff -Nru kdelibs-3.4.0.orig/kspell2/Makefile.in kdelibs-3.4.0/kspell2/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kspell2/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24069,113 +23943,9 @@
backgroundengine.lo: backgroundengine.moc
client.o: client.moc
backgroundchecker.lo: backgroundchecker.moc
-diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in kdelibs-3.4.0/kspell2/plugins/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/plugins/Makefile.in 2005-04-06 13:02:07.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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:
-@@ -530,7 +533,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -542,7 +551,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -550,7 +559,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -571,7 +586,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -818,7 +833,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in 2005-04-06 13:02:07.000000000 -0400
++++ kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24245,7 +24015,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in 2005-04-06 13:02:08.000000000 -0400
++++ kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24313,9 +24083,113 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in kdelibs-3.4.0/kspell2/plugins/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/Makefile.in 2005-04-18 14:40:00.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -230,6 +230,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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:
+@@ -530,7 +533,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -542,7 +551,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -550,7 +559,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -571,7 +586,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -818,7 +833,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kspell2/tests/Makefile.in kdelibs-3.4.0/kspell2/tests/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/tests/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/tests/Makefile.in 2005-04-06 13:02:08.000000000 -0400
++++ kdelibs-3.4.0/kspell2/tests/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24385,7 +24259,7 @@
clean-checkPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/kspell2/ui/Makefile.in kdelibs-3.4.0/kspell2/ui/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/ui/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/ui/Makefile.in 2005-04-06 13:02:08.000000000 -0400
++++ kdelibs-3.4.0/kspell2/ui/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24453,113 +24327,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kstyles/Makefile.in kdelibs-3.4.0/kstyles/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/Makefile.in 2005-04-06 13:02:08.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,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*) \
-@@ -507,9 +510,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:
-@@ -529,7 +532,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -817,7 +832,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.0/kstyles/highcolor/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/highcolor/Makefile.in 2005-04-06 13:02:08.000000000 -0400
++++ kdelibs-3.4.0/kstyles/highcolor/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24629,7 +24399,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.0/kstyles/highcontrast/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/highcontrast/Makefile.in 2005-04-06 13:02:08.000000000 -0400
++++ kdelibs-3.4.0/kstyles/highcontrast/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24699,7 +24469,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in kdelibs-3.4.0/kstyles/keramik/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/keramik/Makefile.in 2005-04-06 13:02:09.000000000 -0400
++++ kdelibs-3.4.0/kstyles/keramik/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24769,7 +24539,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.0/kstyles/klegacy/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/klegacy/Makefile.in 2005-04-06 13:02:09.000000000 -0400
++++ kdelibs-3.4.0/kstyles/klegacy/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24839,7 +24609,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in 2005-04-06 13:02:09.000000000 -0400
++++ kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24909,7 +24679,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kstyles/light/Makefile.in kdelibs-3.4.0/kstyles/light/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/light/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/light/Makefile.in 2005-04-06 13:02:09.000000000 -0400
++++ kdelibs-3.4.0/kstyles/light/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24977,9 +24747,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in kdelibs-3.4.0/kstyles/plastik/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/plastik/Makefile.in 2005-04-06 13:02:10.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kstyles/Makefile.in kdelibs-3.4.0/kstyles/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kstyles/Makefile.in 2005-04-18 14:40:00.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -24993,30 +24763,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(plastik_la_SOURCES)
- DIST_SOURCES = $(plastik_la_SOURCES)
-@@ -278,6 +278,9 @@
+@@ -230,6 +230,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25026,16 +24773,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -469,7 +472,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*) \
-@@ -569,9 +572,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25045,9 +24792,9 @@
-$(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)
-@@ -670,7 +673,13 @@
+
+ mostlyclean-libtool:
+@@ -529,7 +532,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -25062,7 +24809,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -682,7 +691,7 @@
+@@ -541,7 +550,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -25071,7 +24818,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -690,7 +699,13 @@
+@@ -549,7 +558,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -25086,7 +24833,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -711,7 +726,7 @@
+@@ -570,7 +585,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -25095,9 +24842,18 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.0/kstyles/plastik/config/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/plastik/config/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kstyles/plastik/config/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25165,9 +24921,127 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in kdelibs-3.4.0/kstyles/plastik/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/plastik/Makefile.in 2005-04-18 14:40:01.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(plastik_la_SOURCES)
+ DIST_SOURCES = $(plastik_la_SOURCES)
+@@ -278,6 +278,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@
+@@ -531,7 +534,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -569,9 +572,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)
+@@ -670,7 +673,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -682,7 +691,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -690,7 +699,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -711,7 +726,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nru kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in kdelibs-3.4.0/kstyles/riscos/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/riscos/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kstyles/riscos/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25223,7 +25097,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kstyles/themes/Makefile.in kdelibs-3.4.0/kstyles/themes/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/themes/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/themes/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kstyles/themes/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25277,9 +25151,79 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in 2005-04-18 14:40:01.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,18 +71,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kinstalltheme_SOURCES)
+ DIST_SOURCES = $(kinstalltheme_SOURCES)
+@@ -250,6 +250,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -502,7 +505,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*) \
+@@ -540,9 +543,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)
diff -Nru kdelibs-3.4.0.orig/kstyles/utils/Makefile.in kdelibs-3.4.0/kstyles/utils/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/utils/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/utils/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kstyles/utils/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25381,9 +25325,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in 2005-04-06 13:02:10.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kstyles/web/Makefile.in kdelibs-3.4.0/kstyles/web/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/web/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/web/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25397,7 +25341,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -71,18 +71,18 @@
+@@ -83,18 +83,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -25418,9 +25362,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kinstalltheme_SOURCES)
- DIST_SOURCES = $(kinstalltheme_SOURCES)
-@@ -250,6 +250,9 @@
+ SOURCES = $(webstyle_la_SOURCES)
+ DIST_SOURCES = $(webstyle_la_SOURCES)
+@@ -265,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25430,7 +25374,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25439,7 +25383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25449,11 +25393,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdelibs-3.4.0.orig/kstyles/web/Makefile.in kdelibs-3.4.0/kstyles/web/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/web/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/web/Makefile.in 2005-04-06 13:02:10.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in kdelibs-3.4.0/kutils/ksettings/Makefile.in
+--- kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kutils/ksettings/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25467,7 +25411,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
+@@ -74,18 +74,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -25488,9 +25432,9 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(webstyle_la_SOURCES)
- DIST_SOURCES = $(webstyle_la_SOURCES)
-@@ -265,6 +265,9 @@
+ SOURCES = $(libksettings_la_SOURCES)
+ DIST_SOURCES = $(libksettings_la_SOURCES)
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25500,7 +25444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -507,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25509,7 +25453,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -545,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25519,11 +25463,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ clean-noinstLTLIBRARIES:
diff -Nru kdelibs-3.4.0.orig/kutils/Makefile.in kdelibs-3.4.0/kutils/Makefile.in
--- kdelibs-3.4.0.orig/kutils/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kutils/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kutils/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25682,79 +25626,9 @@
@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; \
-diff -Nru kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in kdelibs-3.4.0/kutils/ksettings/Makefile.in
---- kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kutils/ksettings/Makefile.in 2005-04-06 13:02:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksettings_la_SOURCES)
- DIST_SOURCES = $(libksettings_la_SOURCES)
-@@ -262,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@
-@@ -507,7 +510,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -545,9 +548,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:
diff -Nru kdelibs-3.4.0.orig/kutils/tests/Makefile.in kdelibs-3.4.0/kutils/tests/Makefile.in
--- kdelibs-3.4.0.orig/kutils/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kutils/tests/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kutils/tests/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25822,113 +25696,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nru kdelibs-3.4.0.orig/kwallet/Makefile.in kdelibs-3.4.0/kwallet/Makefile.in
---- kdelibs-3.4.0.orig/kwallet/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/Makefile.in 2005-04-06 13:02:10.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -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@
-@@ -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:
-@@ -532,7 +535,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -544,7 +553,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -552,7 +561,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -573,7 +588,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -997,7 +1012,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kwallet/backend/Makefile.in kdelibs-3.4.0/kwallet/backend/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/backend/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/backend/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kwallet/backend/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -25998,7 +25768,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.0/kwallet/backend/tests/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/backend/tests/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kwallet/backend/tests/Makefile.in 2005-04-18 14:40:01.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26068,7 +25838,7 @@
clean-checkPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/kwallet/client/Makefile.in kdelibs-3.4.0/kwallet/client/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/client/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/client/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kwallet/client/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26136,9 +25906,113 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -Nru kdelibs-3.4.0.orig/kwallet/Makefile.in kdelibs-3.4.0/kwallet/Makefile.in
+--- kdelibs-3.4.0.orig/kwallet/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kwallet/Makefile.in 2005-04-18 14:40:01.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -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@
+@@ -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:
+@@ -532,7 +535,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -544,7 +553,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -552,7 +561,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -573,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -997,7 +1012,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/kwallet/tests/Makefile.in kdelibs-3.4.0/kwallet/tests/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/tests/Makefile.in 2005-04-06 13:02:10.000000000 -0400
++++ kdelibs-3.4.0/kwallet/tests/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26208,7 +26082,7 @@
clean-checkPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/libkmid/Makefile.in kdelibs-3.4.0/libkmid/Makefile.in
--- kdelibs-3.4.0.orig/libkmid/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/libkmid/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/libkmid/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26278,7 +26152,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/libkmid/tests/Makefile.in kdelibs-3.4.0/libkmid/tests/Makefile.in
--- kdelibs-3.4.0.orig/libkmid/tests/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/libkmid/tests/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/libkmid/tests/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26361,7 +26235,7 @@
clean-noinstPROGRAMS:
diff -Nru kdelibs-3.4.0.orig/libkscreensaver/Makefile.in kdelibs-3.4.0/libkscreensaver/Makefile.in
--- kdelibs-3.4.0.orig/libkscreensaver/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/libkscreensaver/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/libkscreensaver/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26431,7 +26305,7 @@
@$(NORMAL_INSTALL)
diff -Nru kdelibs-3.4.0.orig/libltdl/Makefile.in kdelibs-3.4.0/libltdl/Makefile.in
--- kdelibs-3.4.0.orig/libltdl/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/libltdl/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/libltdl/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26501,7 +26375,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/licenses/Makefile.in kdelibs-3.4.0/licenses/Makefile.in
--- kdelibs-3.4.0.orig/licenses/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/licenses/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/licenses/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26555,9 +26429,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/mimetypes/Makefile.in kdelibs-3.4.0/mimetypes/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/Makefile.in 2005-04-06 13:02:11.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/Makefile.in kdelibs-3.4.0/Makefile.in
+--- kdelibs-3.4.0.orig/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/Makefile.in 2005-04-18 14:39:45.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26571,7 +26445,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -240,6 +240,9 @@
+@@ -276,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26581,28 +26455,40 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
- all: docs-am all-recursive
-
+@@ -528,7 +531,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*) \
-@@ -519,9 +522,9 @@
+@@ -570,12 +573,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:
-@@ -558,7 +561,13 @@
+ config.h: stamp-h1
+@@ -587,7 +590,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 $@
+@@ -629,7 +632,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -26617,7 +26503,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -570,7 +579,7 @@
+@@ -641,7 +650,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -26626,7 +26512,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -578,7 +587,13 @@
+@@ -649,7 +658,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -26641,7 +26527,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -599,7 +614,7 @@
+@@ -670,7 +685,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -26650,7 +26536,16 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -850,7 +865,7 @@
+@@ -1269,7 +1284,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:
+@@ -1294,7 +1309,7 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
@@ -26661,7 +26556,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/application/Makefile.in kdelibs-3.4.0/mimetypes/application/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/application/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/application/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/application/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26726,7 +26621,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in kdelibs-3.4.0/mimetypes/audio/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/audio/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/audio/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26782,7 +26677,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/image/Makefile.in kdelibs-3.4.0/mimetypes/image/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/image/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/image/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/image/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26838,7 +26733,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in kdelibs-3.4.0/mimetypes/inode/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/inode/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/inode/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26892,9 +26787,113 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/mimetypes/Makefile.in kdelibs-3.4.0/mimetypes/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/Makefile.in 2005-04-18 14:40:02.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -481,7 +484,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*) \
+@@ -519,9 +522,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:
+@@ -558,7 +561,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -570,7 +579,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -578,7 +587,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -599,7 +614,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -850,7 +865,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/message/Makefile.in kdelibs-3.4.0/mimetypes/message/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/message/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/message/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/message/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -26950,7 +26949,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/model/Makefile.in kdelibs-3.4.0/mimetypes/model/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/model/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/model/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/model/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -27006,7 +27005,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.0/mimetypes/multipart/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/multipart/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/multipart/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -27062,7 +27061,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/text/Makefile.in kdelibs-3.4.0/mimetypes/text/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/text/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/text/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/text/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -27127,7 +27126,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in kdelibs-3.4.0/mimetypes/uri/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/uri/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/uri/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -27183,7 +27182,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/mimetypes/video/Makefile.in kdelibs-3.4.0/mimetypes/video/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/video/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/video/Makefile.in 2005-04-06 13:02:11.000000000 -0400
++++ kdelibs-3.4.0/mimetypes/video/Makefile.in 2005-04-18 14:40:02.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -27237,9 +27236,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/pics/Makefile.in kdelibs-3.4.0/pics/Makefile.in
---- kdelibs-3.4.0.orig/pics/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/Makefile.in 2005-04-06 13:02:11.000000000 -0400
+diff -Nru kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in
+--- kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in 2005-04-18 14:40:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -27253,30 +27252,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
- DIST_SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
-@@ -271,6 +271,9 @@
+@@ -216,6 +216,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27286,16 +27262,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -456,7 +459,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*) \
-@@ -557,9 +560,9 @@
+@@ -494,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27305,68 +27281,29 @@
-$(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)
-@@ -643,7 +646,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -655,7 +664,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -663,7 +672,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -684,7 +699,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -911,7 +926,7 @@
+ mostlyclean-libtool:
+@@ -652,7 +655,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:
+@@ -685,7 +688,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.0/pics/crystalsvg/Makefile.in
--- kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/crystalsvg/Makefile.in 2005-04-06 13:02:12.000000000 -0400
++++ kdelibs-3.4.0/pics/crystalsvg/Makefile.in 2005-04-18 14:40:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -34665,74 +34602,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in
---- kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in 2005-04-06 13:02:12.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -216,6 +216,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@
-@@ -456,7 +459,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*) \
-@@ -494,9 +497,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:
-@@ -652,7 +655,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:
-@@ -685,7 +688,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/pics/emoticons/Makefile.in kdelibs-3.4.0/pics/emoticons/Makefile.in
--- kdelibs-3.4.0.orig/pics/emoticons/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/emoticons/Makefile.in 2005-04-06 13:02:12.000000000 -0400
++++ kdelibs-3.4.0/pics/emoticons/Makefile.in 2005-04-18 14:40:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -34788,7 +34660,7 @@
echo "" >> $$i.bchecktest.cc.class; \
diff -Nru kdelibs-3.4.0.orig/pics/hicolor/Makefile.in kdelibs-3.4.0/pics/hicolor/Makefile.in
--- kdelibs-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/hicolor/Makefile.in 2005-04-06 13:02:12.000000000 -0400
++++ kdelibs-3.4.0/pics/hicolor/Makefile.in 2005-04-18 14:40:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
@@ -34892,3 +34764,130 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdelibs-3.4.0.orig/pics/Makefile.in kdelibs-3.4.0/pics/Makefile.in
+--- kdelibs-3.4.0.orig/pics/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/Makefile.in 2005-04-18 14:40:02.000000000 -0400
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
+ DIST_SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
+@@ -271,6 +271,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -519,7 +522,7 @@
+
+ .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*) \
+@@ -557,9 +560,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -643,7 +646,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -655,7 +664,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -663,7 +672,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -684,7 +699,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -911,7 +926,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in LICENSE.crystalsvg Makefile.am
++KDE_DIST=LICENSE.crystalsvg Makefile.in Makefile.am
+
+ #>+ 2
+ docs-am: