[Pkg-kde-commits] rev 709 - branches/kde-3.4.0/packages/kdegraphics/debian/patches
Adeodato Simó
dato-guest@costa.debian.org
Sun, 06 Mar 2005 03:50:19 +0100
Author: dato-guest
Date: 2005-03-06 03:50:13 +0100 (Sun, 06 Mar 2005)
New Revision: 709
Modified:
branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
Uhm, I had this uncommited together with the branch patch removal that
Christopher noticed before.
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-03-06 00:45:39 UTC (rev 708)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff 2005-03-06 02:50:13 UTC (rev 709)
@@ -1,7 +1,122 @@
#DPATCHLEVEL=1
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/Makefile.in kdegraphics-3.4.0/Makefile.in
+--- kdegraphics-3.4.0.orig/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/Makefile.in 2005-03-05 02:51:43.534114060 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -229,6 +229,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@
+@@ -427,7 +430,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -469,12 +472,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
+@@ -486,7 +489,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 $@
+@@ -511,7 +514,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 \
+@@ -523,7 +532,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; \
+@@ -531,7 +540,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)' ;; \
+@@ -552,7 +567,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 \
+@@ -897,7 +912,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+
+ #>+ 2
+ docs-am:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/acinclude.m4 kdegraphics-3.4.0/acinclude.m4
---- kdegraphics-3.4.0.orig/acinclude.m4 2005-02-25 18:19:25.000000000 +0100
-+++ kdegraphics-3.4.0/acinclude.m4 2005-03-03 04:14:57.895287694 +0100
+--- kdegraphics-3.4.0.orig/acinclude.m4 2005-03-04 13:26:26.000000000 +0100
++++ kdegraphics-3.4.0/acinclude.m4 2005-03-05 02:50:16.550029041 +0100
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1446,7 +1561,7 @@
diff -u -Nru -x debian kdegraphics-3.4.0.orig/admin/config.guess kdegraphics-3.4.0/admin/config.guess
--- kdegraphics-3.4.0.orig/admin/config.guess 2004-08-02 16:17:40.000000000 +0200
-+++ kdegraphics-3.4.0/admin/config.guess 2005-03-03 04:16:42.375320938 +0100
++++ kdegraphics-3.4.0/admin/config.guess 2005-03-05 02:52:00.704169908 +0100
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -3007,7 +3122,7 @@
+# End:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/admin/config.sub kdegraphics-3.4.0/admin/config.sub
--- kdegraphics-3.4.0.orig/admin/config.sub 2004-08-02 16:17:40.000000000 +0200
-+++ kdegraphics-3.4.0/admin/config.sub 2005-03-03 04:16:42.388318695 +0100
++++ kdegraphics-3.4.0/admin/config.sub 2005-03-05 02:52:00.716167850 +0100
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -4636,8 +4751,8 @@
+# time-stamp-end: "'"
+# End:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/configure kdegraphics-3.4.0/configure
---- kdegraphics-3.4.0.orig/configure 2005-02-25 18:20:34.000000000 +0100
-+++ kdegraphics-3.4.0/configure 2005-03-03 04:16:36.802282886 +0100
+--- kdegraphics-3.4.0.orig/configure 2005-03-04 13:27:38.000000000 +0100
++++ kdegraphics-3.4.0/configure 2005-03-05 02:51:56.536884474 +0100
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -10280,8 +10395,8 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff -u -Nru -x debian kdegraphics-3.4.0.orig/configure.in kdegraphics-3.4.0/configure.in
---- kdegraphics-3.4.0.orig/configure.in 2005-02-25 18:19:26.000000000 +0100
-+++ kdegraphics-3.4.0/configure.in 2005-03-03 04:14:59.322043315 +0100
+--- kdegraphics-3.4.0.orig/configure.in 2005-03-04 13:26:26.000000000 +0100
++++ kdegraphics-3.4.0/configure.in 2005-03-05 02:50:17.587851090 +0100
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdegraphics, "3.4.0") dnl searches for some needed programs
@@ -10322,14 +10437,114 @@
[AC_MSG_RESULT(no)
eval "ac_cv_lib_vm=no"])
LIBS="$ac_save_LIBS"
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/doc/Makefile.in kdegraphics-3.4.0/doc/Makefile.in
+--- kdegraphics-3.4.0.orig/doc/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/Makefile.in 2005-03-05 02:51:43.543112517 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -212,6 +212,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@
+@@ -396,13 +399,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kamera kcoloredit kdvi kgamma kghostview kiconedit kolourpaint kooka kpdf kpovmodeler kruler ksnapshot kuickshow kview
++SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
+ #>- all: all-recursive
+ #>+ 1
+ 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*) \
+@@ -440,9 +443,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:
+@@ -462,7 +465,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 \
+@@ -474,7 +483,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; \
+@@ -482,7 +491,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)' ;; \
+@@ -503,7 +518,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kamera/Makefile.in kdegraphics-3.4.0/doc/kamera/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kamera/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kamera/Makefile.in 2005-03-03 04:16:23.965498635 +0100
+--- kdegraphics-3.4.0.orig/doc/kamera/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kamera/Makefile.in 2005-03-05 02:51:43.551111145 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10369,23 +10584,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kcoloredit/Makefile.in kdegraphics-3.4.0/doc/kcoloredit/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kcoloredit/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kcoloredit/Makefile.in 2005-03-03 04:16:23.974497081 +0100
+--- kdegraphics-3.4.0.orig/doc/kcoloredit/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kcoloredit/Makefile.in 2005-03-05 02:51:43.558109945 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10425,23 +10630,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kdvi/Makefile.in kdegraphics-3.4.0/doc/kdvi/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kdvi/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kdvi/Makefile.in 2005-03-03 04:16:23.984495356 +0100
+--- kdegraphics-3.4.0.orig/doc/kdvi/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kdvi/Makefile.in 2005-03-05 02:51:43.566108574 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10514,23 +10709,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kgamma/Makefile.in kdegraphics-3.4.0/doc/kgamma/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kgamma/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kgamma/Makefile.in 2005-03-03 04:16:23.993493802 +0100
+--- kdegraphics-3.4.0.orig/doc/kgamma/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kgamma/Makefile.in 2005-03-05 02:51:43.574107202 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10570,23 +10755,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kghostview/Makefile.in kdegraphics-3.4.0/doc/kghostview/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kghostview/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kghostview/Makefile.in 2005-03-03 04:16:24.001492422 +0100
+--- kdegraphics-3.4.0.orig/doc/kghostview/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kghostview/Makefile.in 2005-03-05 02:51:43.581106002 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10626,23 +10801,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kiconedit/Makefile.in kdegraphics-3.4.0/doc/kiconedit/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kiconedit/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kiconedit/Makefile.in 2005-03-03 04:16:24.009491041 +0100
+--- kdegraphics-3.4.0.orig/doc/kiconedit/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kiconedit/Makefile.in 2005-03-05 02:51:43.588104802 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10682,23 +10847,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kolourpaint/Makefile.in kdegraphics-3.4.0/doc/kolourpaint/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kolourpaint/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kolourpaint/Makefile.in 2005-03-03 04:16:24.023488625 +0100
+--- kdegraphics-3.4.0.orig/doc/kolourpaint/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kolourpaint/Makefile.in 2005-03-05 02:51:43.598103088 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10775,23 +10930,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kooka/Makefile.in kdegraphics-3.4.0/doc/kooka/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kooka/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kooka/Makefile.in 2005-03-03 04:16:24.031487244 +0100
+--- kdegraphics-3.4.0.orig/doc/kooka/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kooka/Makefile.in 2005-03-05 02:51:43.606101716 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10868,23 +11013,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kpdf/Makefile.in kdegraphics-3.4.0/doc/kpdf/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kpdf/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kpdf/Makefile.in 2005-03-03 04:16:24.041485519 +0100
+--- kdegraphics-3.4.0.orig/doc/kpdf/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kpdf/Makefile.in 2005-03-05 02:51:43.613100516 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10924,23 +11059,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kpovmodeler/Makefile.in kdegraphics-3.4.0/doc/kpovmodeler/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kpovmodeler/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kpovmodeler/Makefile.in 2005-03-03 04:16:24.051483793 +0100
+--- kdegraphics-3.4.0.orig/doc/kpovmodeler/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kpovmodeler/Makefile.in 2005-03-05 02:51:43.623098802 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11017,23 +11142,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kruler/Makefile.in kdegraphics-3.4.0/doc/kruler/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kruler/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kruler/Makefile.in 2005-03-03 04:16:24.058482585 +0100
+--- kdegraphics-3.4.0.orig/doc/kruler/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kruler/Makefile.in 2005-03-05 02:51:43.633097087 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11073,23 +11188,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/ksnapshot/Makefile.in kdegraphics-3.4.0/doc/ksnapshot/Makefile.in
---- kdegraphics-3.4.0.orig/doc/ksnapshot/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/ksnapshot/Makefile.in 2005-03-03 04:16:24.066481204 +0100
+--- kdegraphics-3.4.0.orig/doc/ksnapshot/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/ksnapshot/Makefile.in 2005-03-05 02:51:43.640095887 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11162,23 +11267,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kuickshow/Makefile.in kdegraphics-3.4.0/doc/kuickshow/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kuickshow/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kuickshow/Makefile.in 2005-03-03 04:16:24.075479651 +0100
+--- kdegraphics-3.4.0.orig/doc/kuickshow/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kuickshow/Makefile.in 2005-03-05 02:51:43.651094001 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11251,23 +11346,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/kview/Makefile.in kdegraphics-3.4.0/doc/kview/Makefile.in
---- kdegraphics-3.4.0.orig/doc/kview/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/kview/Makefile.in 2005-03-03 04:16:24.083478270 +0100
+--- kdegraphics-3.4.0.orig/doc/kview/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/doc/kview/Makefile.in 2005-03-05 02:51:43.658092801 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11340,23 +11425,13 @@
cp $(srcdir)/$$file $(distdir); \
done
-@@ -643,7 +646,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 -u -Nru -x debian kdegraphics-3.4.0.orig/doc/Makefile.in kdegraphics-3.4.0/doc/Makefile.in
---- kdegraphics-3.4.0.orig/doc/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/doc/Makefile.in 2005-03-03 04:16:23.956500188 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/Makefile.in kdegraphics-3.4.0/kamera/Makefile.in
+--- kdegraphics-3.4.0.orig/kamera/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kamera/Makefile.in 2005-03-05 02:51:43.666091430 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11365,7 +11440,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.
-@@ -212,6 +212,9 @@
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11375,14 +11450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,13 +399,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kamera kcoloredit kdvi kgamma kghostview kiconedit kolourpaint kooka kpdf kpovmodeler kruler ksnapshot kuickshow kview
-+SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
- #>- all: all-recursive
- #>+ 1
+@@ -399,7 +402,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11391,7 +11459,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11403,7 +11471,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -462,7 +465,13 @@
+@@ -459,7 +462,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):
@@ -11418,7 +11486,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -474,7 +483,7 @@
+@@ -471,7 +480,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -11427,7 +11495,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -482,7 +491,13 @@
+@@ -479,7 +488,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -11442,7 +11510,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -503,7 +518,7 @@
+@@ -500,7 +515,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -11451,23 +11519,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -750,7 +765,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/kcontrol/Makefile.in kdegraphics-3.4.0/kamera/kcontrol/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/kcontrol/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/kcontrol/Makefile.in 2005-03-03 04:16:24.152466362 +0100
+--- kdegraphics-3.4.0.orig/kamera/kcontrol/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kamera/kcontrol/Makefile.in 2005-03-05 02:51:43.715083029 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11531,13 +11589,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/kioslave/Makefile.in kdegraphics-3.4.0/kamera/kioslave/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/kioslave/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/kioslave/Makefile.in 2005-03-03 04:16:24.165464119 +0100
+--- kdegraphics-3.4.0.orig/kamera/kioslave/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kamera/kioslave/Makefile.in 2005-03-05 02:51:43.726081143 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11600,118 +11657,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/Makefile.in kdegraphics-3.4.0/kamera/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/Makefile.in 2005-03-03 04:16:24.091476889 +0100
-@@ -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.2 $
- # @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.
-@@ -213,6 +213,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@
-@@ -399,7 +402,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*) \
-@@ -437,9 +440,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:
-@@ -459,7 +462,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 \
-@@ -471,7 +480,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; \
-@@ -479,7 +488,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)' ;; \
-@@ -500,7 +515,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 \
-@@ -747,7 +762,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kamera/pics/Makefile.in kdegraphics-3.4.0/kamera/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kamera/pics/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/kamera/pics/Makefile.in 2005-03-03 04:16:24.174462565 +0100
+--- kdegraphics-3.4.0.orig/kamera/pics/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kamera/pics/Makefile.in 2005-03-05 02:51:43.738079086 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11793,23 +11745,13 @@
#>+ 15
force-reedit:
-@@ -624,7 +627,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kcoloredit/Makefile.in kdegraphics-3.4.0/kcoloredit/Makefile.in
---- kdegraphics-3.4.0.orig/kcoloredit/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kcoloredit/Makefile.in 2005-03-03 04:16:24.305439957 +0100
+--- kdegraphics-3.4.0.orig/kcoloredit/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kcoloredit/Makefile.in 2005-03-05 02:51:43.828063656 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11911,13 +11853,12 @@
#>+ 15
force-reedit:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kdvi/Makefile.in kdegraphics-3.4.0/kdvi/Makefile.in
---- kdegraphics-3.4.0.orig/kdvi/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kdvi/Makefile.in 2005-03-03 04:16:24.511404406 +0100
+--- kdegraphics-3.4.0.orig/kdvi/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kdvi/Makefile.in 2005-03-05 02:51:43.914048912 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12105,13 +12046,12 @@
#>+ 5
clean-ui:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kdvi/pix/Makefile.in kdegraphics-3.4.0/kdvi/pix/Makefile.in
---- kdegraphics-3.4.0.orig/kdvi/pix/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kdvi/pix/Makefile.in 2005-03-03 04:16:24.527401644 +0100
+--- kdegraphics-3.4.0.orig/kdvi/pix/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kdvi/pix/Makefile.in 2005-03-05 02:51:43.922047541 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12178,23 +12118,13 @@
#>+ 15
force-reedit:
-@@ -615,7 +618,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kfax/Makefile.in kdegraphics-3.4.0/kfax/Makefile.in
---- kdegraphics-3.4.0.orig/kfax/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfax/Makefile.in 2005-03-03 04:16:24.580392497 +0100
+--- kdegraphics-3.4.0.orig/kfax/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfax/Makefile.in 2005-03-05 02:51:44.008032797 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12279,13 +12209,12 @@
#>+ 15
force-reedit:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfaxview/Makefile.in kdegraphics-3.4.0/kfaxview/Makefile.in
---- kdegraphics-3.4.0.orig/kfaxview/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfaxview/Makefile.in 2005-03-03 04:16:24.601388873 +0100
+--- kdegraphics-3.4.0.orig/kfaxview/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfaxview/Makefile.in 2005-03-05 02:51:44.033028511 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12361,14 +12290,107 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/Makefile.in kdegraphics-3.4.0/kfile-plugins/Makefile.in
+--- kdegraphics-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/Makefile.in 2005-03-05 02:51:44.041027140 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -213,6 +213,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@
+@@ -403,7 +406,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*) \
+@@ -441,9 +444,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:
+@@ -463,7 +466,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 \
+@@ -475,7 +484,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; \
+@@ -483,7 +492,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)' ;; \
+@@ -504,7 +519,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/bmp/Makefile.in kdegraphics-3.4.0/kfile-plugins/bmp/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/bmp/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/bmp/Makefile.in 2005-03-03 04:16:24.650380417 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/bmp/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/bmp/Makefile.in 2005-03-05 02:51:44.065023025 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12432,13 +12454,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/dds/Makefile.in kdegraphics-3.4.0/kfile-plugins/dds/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/dds/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/dds/Makefile.in 2005-03-03 04:16:24.671376793 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/dds/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/dds/Makefile.in 2005-03-05 02:51:44.088019082 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12502,13 +12523,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/dvi/Makefile.in kdegraphics-3.4.0/kfile-plugins/dvi/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/dvi/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/dvi/Makefile.in 2005-03-03 04:16:24.685374376 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/dvi/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/dvi/Makefile.in 2005-03-05 02:51:44.114014624 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12572,13 +12592,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/exr/Makefile.in kdegraphics-3.4.0/kfile-plugins/exr/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/exr/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/exr/Makefile.in 2005-03-03 04:16:24.700371788 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/exr/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/exr/Makefile.in 2005-03-05 02:51:44.144009481 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12642,13 +12661,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/gif/Makefile.in kdegraphics-3.4.0/kfile-plugins/gif/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/gif/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/gif/Makefile.in 2005-03-03 04:16:24.714369372 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/gif/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/gif/Makefile.in 2005-03-05 02:51:44.164006052 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12712,13 +12730,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/ico/Makefile.in kdegraphics-3.4.0/kfile-plugins/ico/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/ico/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/ico/Makefile.in 2005-03-03 04:16:24.727367128 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/ico/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/ico/Makefile.in 2005-03-05 02:51:44.195000738 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12782,13 +12799,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/jpeg/Makefile.in kdegraphics-3.4.0/kfile-plugins/jpeg/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/jpeg/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/jpeg/Makefile.in 2005-03-03 04:16:24.772359362 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/jpeg/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/jpeg/Makefile.in 2005-03-05 02:51:44.223995766 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12851,118 +12867,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/Makefile.in kdegraphics-3.4.0/kfile-plugins/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/Makefile.in 2005-03-03 04:16:24.610387320 +0100
-@@ -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.2 $
- # @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.
-@@ -213,6 +213,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@
-@@ -403,7 +406,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*) \
-@@ -441,9 +444,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:
-@@ -463,7 +466,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 \
-@@ -475,7 +484,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; \
-@@ -483,7 +492,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)' ;; \
-@@ -504,7 +519,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 \
-@@ -752,7 +767,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/pcx/Makefile.in kdegraphics-3.4.0/kfile-plugins/pcx/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/pcx/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/pcx/Makefile.in 2005-03-03 04:16:24.795355393 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/pcx/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/pcx/Makefile.in 2005-03-05 02:51:44.235993709 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13026,13 +12937,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/pdf/Makefile.in kdegraphics-3.4.0/kfile-plugins/pdf/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/pdf/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/pdf/Makefile.in 2005-03-03 04:16:24.819351251 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/pdf/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/pdf/Makefile.in 2005-03-05 02:51:44.259989594 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13096,13 +13006,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/png/Makefile.in kdegraphics-3.4.0/kfile-plugins/png/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/png/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/png/Makefile.in 2005-03-03 04:16:24.844346936 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/png/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/png/Makefile.in 2005-03-05 02:51:44.281985822 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13166,13 +13075,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/pnm/Makefile.in kdegraphics-3.4.0/kfile-plugins/pnm/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/pnm/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/pnm/Makefile.in 2005-03-03 04:16:24.861344002 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/pnm/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/pnm/Makefile.in 2005-03-05 02:51:44.294983594 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13236,13 +13144,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/ps/Makefile.in kdegraphics-3.4.0/kfile-plugins/ps/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/ps/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/ps/Makefile.in 2005-03-03 04:16:24.882340378 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/ps/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/ps/Makefile.in 2005-03-05 02:51:44.322978793 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13306,13 +13213,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/rgb/Makefile.in kdegraphics-3.4.0/kfile-plugins/rgb/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/rgb/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/rgb/Makefile.in 2005-03-03 04:16:24.913335028 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/rgb/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/rgb/Makefile.in 2005-03-05 02:51:44.346974679 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13376,13 +13282,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/tga/Makefile.in kdegraphics-3.4.0/kfile-plugins/tga/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/tga/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/tga/Makefile.in 2005-03-03 04:16:24.935331231 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/tga/Makefile.in 2005-03-04 13:27:31.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/tga/Makefile.in 2005-03-05 02:51:44.369970736 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13446,13 +13351,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/tiff/Makefile.in kdegraphics-3.4.0/kfile-plugins/tiff/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/tiff/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/tiff/Makefile.in 2005-03-03 04:16:24.961326744 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/tiff/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/tiff/Makefile.in 2005-03-05 02:51:44.407964221 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13516,13 +13420,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/xbm/Makefile.in kdegraphics-3.4.0/kfile-plugins/xbm/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/xbm/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/xbm/Makefile.in 2005-03-03 04:16:24.979323638 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/xbm/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/xbm/Makefile.in 2005-03-05 02:51:44.419962164 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13586,13 +13489,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kfile-plugins/xpm/Makefile.in kdegraphics-3.4.0/kfile-plugins/xpm/Makefile.in
---- kdegraphics-3.4.0.orig/kfile-plugins/xpm/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kfile-plugins/xpm/Makefile.in 2005-03-03 04:16:25.006318978 +0100
+--- kdegraphics-3.4.0.orig/kfile-plugins/xpm/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kfile-plugins/xpm/Makefile.in 2005-03-05 02:51:44.432959935 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13655,14 +13557,107 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/Makefile.in kdegraphics-3.4.0/kgamma/Makefile.in
+--- kdegraphics-3.4.0.orig/kgamma/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kgamma/Makefile.in 2005-03-05 02:51:44.440958563 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -213,6 +213,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@
+@@ -399,7 +402,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*) \
+@@ -437,9 +440,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:
+@@ -459,7 +462,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 \
+@@ -471,7 +480,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; \
+@@ -479,7 +488,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)' ;; \
+@@ -500,7 +515,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/kcmkgamma/Makefile.in kdegraphics-3.4.0/kgamma/kcmkgamma/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/kcmkgamma/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/kcmkgamma/Makefile.in 2005-03-03 04:16:25.040313110 +0100
+--- kdegraphics-3.4.0.orig/kgamma/kcmkgamma/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kgamma/kcmkgamma/Makefile.in 2005-03-05 02:51:44.497948791 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13774,13 +13769,12 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/kcmkgamma/pics/Makefile.in kdegraphics-3.4.0/kgamma/kcmkgamma/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/kcmkgamma/pics/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/kcmkgamma/pics/Makefile.in 2005-03-03 04:16:25.049311557 +0100
+--- kdegraphics-3.4.0.orig/kgamma/kcmkgamma/pics/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kgamma/kcmkgamma/pics/Makefile.in 2005-03-05 02:51:44.506947248 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13840,127 +13834,13 @@
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgamma.png
#>+ 15
-@@ -646,7 +649,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/Makefile.in kdegraphics-3.4.0/kgamma/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/Makefile.in 2005-03-03 04:16:25.015317425 +0100
-@@ -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.2 $
- # @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.
-@@ -213,6 +213,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@
-@@ -399,7 +402,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*) \
-@@ -437,9 +440,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:
-@@ -459,7 +462,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 \
-@@ -471,7 +480,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; \
-@@ -479,7 +488,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)' ;; \
-@@ -500,7 +515,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 \
-@@ -747,7 +762,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kgamma/xf86gammacfg/Makefile.in kdegraphics-3.4.0/kgamma/xf86gammacfg/Makefile.in
---- kdegraphics-3.4.0.orig/kgamma/xf86gammacfg/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kgamma/xf86gammacfg/Makefile.in 2005-03-03 04:16:25.059309831 +0100
+--- kdegraphics-3.4.0.orig/kgamma/xf86gammacfg/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kgamma/xf86gammacfg/Makefile.in 2005-03-05 02:51:44.516945534 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14023,70 +13903,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kghostview/data/Makefile.in kdegraphics-3.4.0/kghostview/data/Makefile.in
---- kdegraphics-3.4.0.orig/kghostview/data/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kghostview/data/Makefile.in 2005-03-03 04:16:25.220282046 +0100
-@@ -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.2 $
- # @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.
-@@ -206,6 +206,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@
-@@ -393,7 +396,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*) \
-@@ -431,9 +434,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:
-@@ -625,7 +628,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kghostview/Makefile.in kdegraphics-3.4.0/kghostview/Makefile.in
---- kdegraphics-3.4.0.orig/kghostview/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kghostview/Makefile.in 2005-03-03 04:16:25.213283254 +0100
+--- kdegraphics-3.4.0.orig/kghostview/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kghostview/Makefile.in 2005-03-05 02:51:44.672918789 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14240,14 +14063,59 @@
#>+ 15
force-reedit:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kghostview/data/Makefile.in kdegraphics-3.4.0/kghostview/data/Makefile.in
+--- kdegraphics-3.4.0.orig/kghostview/data/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kghostview/data/Makefile.in 2005-03-05 02:51:44.679917589 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -206,6 +206,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@
+@@ -393,7 +396,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*) \
+@@ -431,9 +434,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:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/Makefile.in kdegraphics-3.4.0/kiconedit/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/Makefile.in 2005-03-03 04:16:25.319264960 +0100
+--- kdegraphics-3.4.0.orig/kiconedit/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kiconedit/Makefile.in 2005-03-05 02:51:44.769902159 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14397,70 +14265,13 @@
@echo 'creating kiconedit.all_cpp.cpp ...'; \
rm -f kiconedit.all_cpp.files kiconedit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kiconedit.all_cpp.final; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/icons/Makefile.in kdegraphics-3.4.0/kiconedit/pics/icons/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/pics/icons/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/pics/icons/Makefile.in 2005-03-03 04:16:25.336262026 +0100
-@@ -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.2 $
- # @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.
-@@ -206,6 +206,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@
-@@ -396,7 +399,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*) \
-@@ -434,9 +437,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:
-@@ -628,7 +631,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/Makefile.in kdegraphics-3.4.0/kiconedit/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/pics/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/pics/Makefile.in 2005-03-03 04:16:25.328263407 +0100
+--- kdegraphics-3.4.0.orig/kiconedit/pics/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kiconedit/pics/Makefile.in 2005-03-05 02:51:44.791898388 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14567,23 +14378,13 @@
#>+ 15
force-reedit:
-@@ -765,7 +780,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/toolbar/Makefile.in kdegraphics-3.4.0/kiconedit/pics/toolbar/Makefile.in
---- kdegraphics-3.4.0.orig/kiconedit/pics/toolbar/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kiconedit/pics/toolbar/Makefile.in 2005-03-03 04:16:25.344260646 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/icons/Makefile.in kdegraphics-3.4.0/kiconedit/pics/icons/Makefile.in
+--- kdegraphics-3.4.0.orig/kiconedit/pics/icons/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kiconedit/pics/icons/Makefile.in 2005-03-05 02:51:44.797897359 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14602,7 +14403,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -396,7 +399,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14611,7 +14412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -434,9 +437,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14623,32 +14424,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -616,7 +619,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
-+KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
-
- #>+ 2
- docs-am:
-@@ -649,7 +652,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/kcontrol/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/kcontrol/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/kcontrol/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/kcontrol/Makefile.in 2005-03-03 04:16:25.478237520 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kiconedit/pics/toolbar/Makefile.in kdegraphics-3.4.0/kiconedit/pics/toolbar/Makefile.in
+--- kdegraphics-3.4.0.orig/kiconedit/pics/toolbar/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kiconedit/pics/toolbar/Makefile.in 2005-03-05 02:51:44.805895988 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14657,30 +14439,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 @@
- #>+ 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 = $(kcm_kmrml_la_SOURCES)
- DIST_SOURCES = $(kcm_kmrml_la_SOURCES)
-@@ -251,6 +251,9 @@
+@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14690,16 +14449,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -417,7 +420,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*) \
-@@ -488,9 +491,9 @@
+@@ -455,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14709,16 +14468,24 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/lib/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/lib/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/lib/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/lib/Makefile.in 2005-03-03 04:16:25.500233723 +0100
+
+ mostlyclean-libtool:
+@@ -616,7 +619,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
++KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/Makefile.in kdegraphics-3.4.0/kmrml/Makefile.in
+--- kdegraphics-3.4.0.orig/kmrml/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kmrml/Makefile.in 2005-03-05 02:51:44.813894616 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14727,30 +14494,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.
-@@ -72,18 +72,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 = $(libkmrmlstuff_la_SOURCES)
- DIST_SOURCES = $(libkmrmlstuff_la_SOURCES)
-@@ -237,6 +237,9 @@
+@@ -213,6 +213,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14760,16 +14504,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -399,7 +402,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*) \
-@@ -472,9 +475,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14780,15 +14524,62 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
+ mostlyclean-libtool:
+@@ -459,7 +462,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 \
+@@ -471,7 +480,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; \
+@@ -479,7 +488,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)' ;; \
+@@ -500,7 +515,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/Makefile.in 2005-03-03 04:16:25.417248047 +0100
+--- kdegraphics-3.4.0.orig/kmrml/kmrml/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kmrml/kmrml/Makefile.in 2005-03-05 02:51:44.870884844 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14946,14 +14737,13 @@
@echo 'creating libkmrmlpart_la.all_cpp.cpp ...'; \
rm -f libkmrmlpart_la.all_cpp.files libkmrmlpart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/server/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/server/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/kmrml/server/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/kmrml/server/Makefile.in 2005-03-03 04:16:25.526229236 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/kcontrol/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/kcontrol/Makefile.in
+--- kdegraphics-3.4.0.orig/kmrml/kmrml/kcontrol/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kmrml/kmrml/kcontrol/Makefile.in 2005-03-05 02:51:44.920876272 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14962,7 +14752,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 @@
+@@ -84,18 +84,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -14983,9 +14773,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 = $(kded_daemonwatcher_la_SOURCES)
- DIST_SOURCES = $(kded_daemonwatcher_la_SOURCES)
-@@ -244,6 +244,9 @@
+ SOURCES = $(kcm_kmrml_la_SOURCES)
+ DIST_SOURCES = $(kcm_kmrml_la_SOURCES)
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14995,7 +14785,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -450,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15004,7 +14794,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15016,14 +14806,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/Makefile.in kdegraphics-3.4.0/kmrml/Makefile.in
---- kdegraphics-3.4.0.orig/kmrml/Makefile.in 2005-02-25 18:20:29.000000000 +0100
-+++ kdegraphics-3.4.0/kmrml/Makefile.in 2005-03-03 04:16:25.353259093 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/lib/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/lib/Makefile.in
+--- kdegraphics-3.4.0.orig/kmrml/kmrml/lib/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kmrml/kmrml/lib/Makefile.in 2005-03-05 02:51:44.938873186 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15032,7 +14821,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.
-@@ -213,6 +213,9 @@
+@@ -72,18 +72,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 = $(libkmrmlstuff_la_SOURCES)
+ DIST_SOURCES = $(libkmrmlstuff_la_SOURCES)
+@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15042,16 +14854,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am all-recursive
+@@ -434,7 +437,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*) \
-@@ -437,9 +440,9 @@
+@@ -472,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15062,72 +14874,14 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-@@ -459,7 +462,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 \
-@@ -471,7 +480,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; \
-@@ -479,7 +488,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)' ;; \
-@@ -500,7 +515,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 \
-@@ -747,7 +762,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/cursors/Makefile.in kdegraphics-3.4.0/kolourpaint/cursors/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/cursors/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/cursors/Makefile.in 2005-03-03 04:16:25.827177289 +0100
+ clean-noinstLTLIBRARIES:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kmrml/kmrml/server/Makefile.in kdegraphics-3.4.0/kmrml/kmrml/server/Makefile.in
+--- kdegraphics-3.4.0.orig/kmrml/kmrml/server/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kmrml/kmrml/server/Makefile.in 2005-03-05 02:51:44.961869243 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15136,7 +14890,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.
-@@ -70,18 +70,18 @@
+@@ -78,18 +78,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -15157,9 +14911,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 = $(libkolourpaintcursors_la_SOURCES)
- DIST_SOURCES = $(libkolourpaintcursors_la_SOURCES)
-@@ -234,6 +234,9 @@
+ SOURCES = $(kded_daemonwatcher_la_SOURCES)
+ DIST_SOURCES = $(kded_daemonwatcher_la_SOURCES)
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15169,7 +14923,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -441,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15178,7 +14932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -479,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15188,16 +14942,15 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/Makefile.in kdegraphics-3.4.0/kolourpaint/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/Makefile.in 2005-03-03 04:16:25.806180914 +0100
+--- kdegraphics-3.4.0.orig/kolourpaint/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/Makefile.in 2005-03-05 02:51:45.153836326 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15358,14 +15111,13 @@
@echo 'creating kolourpaint.all_cpp.cpp ...'; \
rm -f kolourpaint.all_cpp.files kolourpaint.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kolourpaint.all_cpp.final; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pics/custom/Makefile.in kdegraphics-3.4.0/kolourpaint/pics/custom/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/pics/custom/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/pics/custom/Makefile.in 2005-03-03 04:16:25.848173665 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/cursors/Makefile.in kdegraphics-3.4.0/kolourpaint/cursors/Makefile.in
+--- kdegraphics-3.4.0.orig/kolourpaint/cursors/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/cursors/Makefile.in 2005-03-05 02:51:45.164834440 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15374,7 +15126,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.
-@@ -206,6 +206,9 @@
+@@ -70,18 +70,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 = $(libkolourpaintcursors_la_SOURCES)
+ DIST_SOURCES = $(libkolourpaintcursors_la_SOURCES)
+@@ -234,6 +234,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15384,16 +15159,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
- all: docs-am all-am
+@@ -429,7 +432,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*) \
-@@ -438,9 +441,9 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15404,24 +15179,14 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-@@ -633,7 +636,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; \
+ clean-noinstLTLIBRARIES:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pics/Makefile.in kdegraphics-3.4.0/kolourpaint/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/pics/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/pics/Makefile.in 2005-03-03 04:16:25.840175046 +0100
+--- kdegraphics-3.4.0.orig/kolourpaint/pics/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/pics/Makefile.in 2005-03-05 02:51:45.176832383 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15609,23 +15374,59 @@
#>+ 15
force-reedit:
-@@ -819,7 +834,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pics/custom/Makefile.in kdegraphics-3.4.0/kolourpaint/pics/custom/Makefile.in
+--- kdegraphics-3.4.0.orig/kolourpaint/pics/custom/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/pics/custom/Makefile.in 2005-03-05 02:51:45.183831183 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -206,6 +206,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@
+@@ -400,7 +403,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*) \
+@@ -438,9 +441,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:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/pixmapfx/Makefile.in kdegraphics-3.4.0/kolourpaint/pixmapfx/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/pixmapfx/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/pixmapfx/Makefile.in 2005-03-03 04:16:25.901164518 +0100
+--- kdegraphics-3.4.0.orig/kolourpaint/pixmapfx/Makefile.in 2005-03-04 13:27:32.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/pixmapfx/Makefile.in 2005-03-05 02:51:45.226823811 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15772,13 +15573,12 @@
kpcoloreffect.o: kpcoloreffect.moc
kpeffectsdialog.lo: kpeffectsdialog.moc
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/tools/Makefile.in kdegraphics-3.4.0/kolourpaint/tools/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/tools/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/tools/Makefile.in 2005-03-03 04:16:26.156120510 +0100
+--- kdegraphics-3.4.0.orig/kolourpaint/tools/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/tools/Makefile.in 2005-03-05 02:51:45.703742034 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15851,13 +15651,12 @@
#>+ 2
docs-am:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/views/Makefile.in kdegraphics-3.4.0/kolourpaint/views/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/views/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/views/Makefile.in 2005-03-03 04:16:26.184115678 +0100
+--- kdegraphics-3.4.0.orig/kolourpaint/views/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/views/Makefile.in 2005-03-05 02:51:45.807724204 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15979,13 +15778,12 @@
kpzoomedview.o: kpzoomedview.moc
nmcheck-am: nmcheck
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kolourpaint/widgets/Makefile.in kdegraphics-3.4.0/kolourpaint/widgets/Makefile.in
---- kdegraphics-3.4.0.orig/kolourpaint/widgets/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kolourpaint/widgets/Makefile.in 2005-03-03 04:16:26.238106359 +0100
+--- kdegraphics-3.4.0.orig/kolourpaint/widgets/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kolourpaint/widgets/Makefile.in 2005-03-05 02:51:46.018688030 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16127,13 +15925,12 @@
kpcolortoolbar.o: kpcolortoolbar.moc
kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kooka/Makefile.in kdegraphics-3.4.0/kooka/Makefile.in
---- kdegraphics-3.4.0.orig/kooka/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kooka/Makefile.in 2005-03-03 04:16:26.475065457 +0100
+--- kdegraphics-3.4.0.orig/kooka/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kooka/Makefile.in 2005-03-05 02:51:46.699571279 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16435,13 +16232,12 @@
nmcheck-am: nmcheck
imgprintdialog.lo: imgprintdialog.moc
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kooka/pics/Makefile.in kdegraphics-3.4.0/kooka/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kooka/pics/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kooka/pics/Makefile.in 2005-03-03 04:16:26.483064077 +0100
+--- kdegraphics-3.4.0.orig/kooka/pics/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kooka/pics/Makefile.in 2005-03-05 02:51:46.706570079 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16490,23 +16286,13 @@
#>+ 2
docs-am:
-@@ -632,7 +635,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/conf/Makefile.in kdegraphics-3.4.0/kpdf/conf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/conf/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/conf/Makefile.in 2005-03-03 04:16:26.557051306 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/Makefile.in kdegraphics-3.4.0/kpdf/Makefile.in
+--- kdegraphics-3.4.0.orig/kpdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/Makefile.in 2005-03-05 02:51:46.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16515,7 +16301,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.
-@@ -68,18 +68,18 @@
+@@ -82,18 +82,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -16536,9 +16322,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 = $(libkpdfconf_la_SOURCES)
- DIST_SOURCES = $(libkpdfconf_la_SOURCES)
-@@ -241,6 +241,9 @@
+ SOURCES = $(libkpdfpart_la_SOURCES)
+ DIST_SOURCES = $(libkpdfpart_la_SOURCES)
+@@ -263,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16548,7 +16334,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16557,7 +16343,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16567,16 +16353,99 @@
-$(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)
+@@ -626,7 +629,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 \
+@@ -638,7 +647,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; \
+@@ -646,7 +655,13 @@
- clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/core/generator_pdf/Makefile.in kdegraphics-3.4.0/kpdf/core/generator_pdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/core/generator_pdf/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/core/generator_pdf/Makefile.in 2005-03-03 04:16:26.652034911 +0100
+ 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)' ;; \
+@@ -667,7 +682,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 \
+@@ -953,26 +968,26 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+
+ #>+ 15
+ force-reedit:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/conf/Makefile.in kdegraphics-3.4.0/kpdf/conf/Makefile.in
+--- kdegraphics-3.4.0.orig/kpdf/conf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/conf/Makefile.in 2005-03-05 02:51:46.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16585,7 +16454,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.
-@@ -64,18 +64,18 @@
+@@ -68,18 +68,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -16606,9 +16475,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 = $(libgeneratorpdf_la_SOURCES)
- DIST_SOURCES = $(libgeneratorpdf_la_SOURCES)
-@@ -228,6 +228,9 @@
+ SOURCES = $(libkpdfconf_la_SOURCES)
+ DIST_SOURCES = $(libkpdfconf_la_SOURCES)
+@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16618,7 +16487,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -439,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16627,7 +16496,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -477,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16640,13 +16509,12 @@
clean-noinstLTLIBRARIES:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/core/Makefile.in kdegraphics-3.4.0/kpdf/core/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/core/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/core/Makefile.in 2005-03-03 04:16:26.642036637 +0100
+--- kdegraphics-3.4.0.orig/kpdf/core/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/core/Makefile.in 2005-03-05 02:51:47.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16757,14 +16625,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/Makefile.in kdegraphics-3.4.0/kpdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/Makefile.in 2005-03-03 04:16:26.536054930 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/core/generator_pdf/Makefile.in kdegraphics-3.4.0/kpdf/core/generator_pdf/Makefile.in
+--- kdegraphics-3.4.0.orig/kpdf/core/generator_pdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/core/generator_pdf/Makefile.in 2005-03-05 02:51:47.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16773,7 +16640,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 @@
+@@ -64,18 +64,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -16794,9 +16661,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 = $(libkpdfpart_la_SOURCES)
- DIST_SOURCES = $(libkpdfpart_la_SOURCES)
-@@ -263,6 +263,9 @@
+ SOURCES = $(libgeneratorpdf_la_SOURCES)
+ DIST_SOURCES = $(libgeneratorpdf_la_SOURCES)
+@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16806,7 +16673,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -419,7 +422,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16815,7 +16682,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16825,100 +16692,15 @@
-$(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)
-@@ -626,7 +629,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 \
-@@ -638,7 +647,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; \
-@@ -646,7 +655,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)' ;; \
-@@ -667,7 +682,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 \
-@@ -953,26 +968,26 @@
-
- #>+ 22
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
-
- #>+ 15
- force-reedit:
+ clean-noinstLTLIBRARIES:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/shell/Makefile.in kdegraphics-3.4.0/kpdf/shell/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/shell/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/shell/Makefile.in 2005-03-03 04:16:26.696027317 +0100
+--- kdegraphics-3.4.0.orig/kpdf/shell/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/shell/Makefile.in 2005-03-05 02:51:48.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16982,13 +16764,12 @@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/ui/Makefile.in kdegraphics-3.4.0/kpdf/ui/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/ui/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/ui/Makefile.in 2005-03-03 04:16:26.852000395 +0100
+--- kdegraphics-3.4.0.orig/kpdf/ui/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/ui/Makefile.in 2005-03-05 02:51:48.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17094,14 +16875,107 @@
@echo 'creating libkpdfui_la.all_cpp.cpp ...'; \
rm -f libkpdfui_la.all_cpp.files libkpdfui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkpdfui_la.all_cpp.final; \
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/Makefile.in
+--- kdegraphics-3.4.0.orig/kpdf/xpdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/xpdf/Makefile.in 2005-03-05 02:51:48.000000000 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -212,6 +212,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@
+@@ -398,7 +401,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*) \
+@@ -436,9 +439,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:
+@@ -458,7 +461,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 \
+@@ -470,7 +479,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; \
+@@ -478,7 +487,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)' ;; \
+@@ -499,7 +514,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/fofi/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/fofi/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/fofi/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/fofi/Makefile.in 2005-03-03 04:16:26.897992456 +0100
+--- kdegraphics-3.4.0.orig/kpdf/xpdf/fofi/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/xpdf/fofi/Makefile.in 2005-03-05 02:51:48.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17165,13 +17039,12 @@
clean-noinstLTLIBRARIES:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/goo/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/goo/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/goo/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/goo/Makefile.in 2005-03-03 04:16:26.908990558 +0100
+--- kdegraphics-3.4.0.orig/kpdf/xpdf/goo/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/xpdf/goo/Makefile.in 2005-03-05 02:51:48.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17247,14 +17120,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/Makefile.in 2005-03-03 04:16:26.866997806 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/splash/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/splash/Makefile.in
+--- kdegraphics-3.4.0.orig/kpdf/xpdf/splash/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/xpdf/splash/Makefile.in 2005-03-05 02:51:48.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17263,7 +17135,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.
-@@ -212,6 +212,9 @@
+@@ -79,18 +79,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 = $(libsplash_la_SOURCES)
+ DIST_SOURCES = $(libsplash_la_SOURCES)
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17273,16 +17168,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -436,7 +439,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*) \
-@@ -436,9 +439,9 @@
+@@ -474,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17293,72 +17188,14 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
-@@ -458,7 +461,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 \
-@@ -470,7 +479,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; \
-@@ -478,7 +487,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)' ;; \
-@@ -499,7 +514,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 \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/splash/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/splash/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/splash/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/splash/Makefile.in 2005-03-03 04:16:26.922988142 +0100
+ clean-noinstLTLIBRARIES:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/xpdf/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/xpdf/Makefile.in
+--- kdegraphics-3.4.0.orig/kpdf/xpdf/xpdf/Makefile.in 2005-03-04 13:27:33.000000000 +0100
++++ kdegraphics-3.4.0/kpdf/xpdf/xpdf/Makefile.in 2005-03-05 02:51:48.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17367,7 +17204,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 @@
+@@ -86,18 +86,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17388,9 +17225,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 = $(libsplash_la_SOURCES)
- DIST_SOURCES = $(libsplash_la_SOURCES)
-@@ -243,6 +243,9 @@
+ SOURCES = $(libxpdf_la_SOURCES)
+ DIST_SOURCES = $(libxpdf_la_SOURCES)
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17400,7 +17237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -449,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17409,7 +17246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17421,14 +17258,22 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpdf/xpdf/xpdf/Makefile.in kdegraphics-3.4.0/kpdf/xpdf/xpdf/Makefile.in
---- kdegraphics-3.4.0.orig/kpdf/xpdf/xpdf/Makefile.in 2005-02-25 18:20:30.000000000 +0100
-+++ kdegraphics-3.4.0/kpdf/xpdf/xpdf/Makefile.in 2005-03-03 04:16:26.936985725 +0100
+@@ -753,7 +756,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h Parser.h JArithmeticDecoder.h GfxFont.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
++KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
+
+ #>+ 2
+ docs-am:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/Makefile.in kdegraphics-3.4.0/kpovmodeler/Makefile.in
+--- kdegraphics-3.4.0.orig/kpovmodeler/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/Makefile.in 2005-03-05 02:51:50.698885517 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17437,7 +17282,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 @@
+@@ -256,18 +256,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17458,9 +17303,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 = $(libxpdf_la_SOURCES)
- DIST_SOURCES = $(libxpdf_la_SOURCES)
-@@ -250,6 +250,9 @@
+ SOURCES = $(libkpovmodeler_la_SOURCES) \
+ $(libkpovmodelerpart_la_SOURCES) $(kpovmodeler_SOURCES)
+@@ -440,6 +440,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17470,16 +17315,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -954,7 +957,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*) \
-@@ -487,9 +490,9 @@
+@@ -992,9 +995,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17489,25 +17334,520 @@
-$(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)
+@@ -1428,7 +1431,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 \
+@@ -1440,7 +1449,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; \
+@@ -1448,7 +1457,13 @@
- clean-noinstLTLIBRARIES:
-@@ -753,7 +756,7 @@
- .NOEXPORT:
+ 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)' ;; \
+@@ -1469,7 +1484,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 \
+@@ -1756,18 +1771,18 @@
+ mocs: pmcylinderedit.moc
+ #>+ 3
+-pmtorusedit.moc: $(srcdir)/pmtorusedit.h
+- $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
++pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
++ $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
+
#>+ 2
--KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h Parser.h JArithmeticDecoder.h GfxFont.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
-+KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h
+-mocs: pmtorusedit.moc
++mocs: pminteriortextureedit.moc
+ #>+ 3
+-pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
+- $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
++pmtorusedit.moc: $(srcdir)/pmtorusedit.h
++ $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
+
#>+ 2
- docs-am:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/inlined/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/inlined/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/inlined/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/includes/inlined/Makefile.in 2005-03-03 04:16:32.237070881 +0100
+-mocs: pminteriortextureedit.moc
++mocs: pmtorusedit.moc
+
+ #>+ 3
+ pmblobedit.moc: $(srcdir)/pmblobedit.h
+@@ -1826,13 +1841,6 @@
+ mocs: pmcameraedit.moc
+
+ #>+ 3
+-pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
+- $(MOC) $(srcdir)/pmlayoutsettings.h -o pmlayoutsettings.moc
+-
+-#>+ 2
+-mocs: pmlayoutsettings.moc
+-
+-#>+ 3
+ pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
+ $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
+
+@@ -1847,6 +1855,13 @@
+ mocs: pmboxedit.moc
+
+ #>+ 3
++pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
++ $(MOC) $(srcdir)/pmlayoutsettings.h -o pmlayoutsettings.moc
++
++#>+ 2
++mocs: pmlayoutsettings.moc
++
++#>+ 3
+ pmspheresweepedit.moc: $(srcdir)/pmspheresweepedit.h
+ $(MOC) $(srcdir)/pmspheresweepedit.h -o pmspheresweepedit.moc
+
+@@ -1861,25 +1876,25 @@
+ mocs: pmdockwidget_private.moc
+
+ #>+ 3
+-pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
+- $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
++pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
++ $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
+
+ #>+ 2
+-mocs: pmlibraryiconview.moc
++mocs: pmimagemapedit.moc
+
+ #>+ 3
+-pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
+- $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
++pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
++ $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
+
+ #>+ 2
+-mocs: pmimagemapedit.moc
++mocs: pmlibraryiconview.moc
+
+ #>+ 3
+-pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
+- $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
++pmdragwidget.moc: $(srcdir)/pmdragwidget.h
++ $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
+
+ #>+ 2
+-mocs: pmradiosityedit.moc
++mocs: pmdragwidget.moc
+
+ #>+ 3
+ pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
+@@ -1889,11 +1904,11 @@
+ mocs: pmlightgroupedit.moc
+
+ #>+ 3
+-pmdragwidget.moc: $(srcdir)/pmdragwidget.h
+- $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
++pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
++ $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
+
+ #>+ 2
+-mocs: pmdragwidget.moc
++mocs: pmradiosityedit.moc
+
+ #>+ 3
+ pmactions.moc: $(srcdir)/pmactions.h
+@@ -1903,13 +1918,6 @@
+ mocs: pmactions.moc
+
+ #>+ 3
+-pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
+- $(MOC) $(srcdir)/pmlibrarybrowser.h -o pmlibrarybrowser.moc
+-
+-#>+ 2
+-mocs: pmlibrarybrowser.moc
+-
+-#>+ 3
+ pmdiscedit.moc: $(srcdir)/pmdiscedit.h
+ $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
+
+@@ -1917,11 +1925,11 @@
+ mocs: pmdiscedit.moc
+
+ #>+ 3
+-pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
+- $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
++pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
++ $(MOC) $(srcdir)/pmlibrarybrowser.h -o pmlibrarybrowser.moc
+
+ #>+ 2
+-mocs: pmpalettevalueedit.moc
++mocs: pmlibrarybrowser.moc
+
+ #>+ 3
+ pmlightedit.moc: $(srcdir)/pmlightedit.h
+@@ -1931,11 +1939,11 @@
+ mocs: pmlightedit.moc
+
+ #>+ 3
+-pmview.moc: $(srcdir)/pmview.h
+- $(MOC) $(srcdir)/pmview.h -o pmview.moc
++pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
++ $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
+
+ #>+ 2
+-mocs: pmview.moc
++mocs: pmpalettevalueedit.moc
+
+ #>+ 3
+ pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
+@@ -1945,6 +1953,13 @@
+ mocs: pmobjectlibrarysettings.moc
+
+ #>+ 3
++pmview.moc: $(srcdir)/pmview.h
++ $(MOC) $(srcdir)/pmview.h -o pmview.moc
++
++#>+ 2
++mocs: pmview.moc
++
++#>+ 3
+ pmfactory.moc: $(srcdir)/pmfactory.h
+ $(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
+
+@@ -2036,18 +2051,18 @@
+ mocs: pmfiledialog.moc
+
+ #>+ 3
+-pmpovraymatrixedit.moc: $(srcdir)/pmpovraymatrixedit.h
+- $(MOC) $(srcdir)/pmpovraymatrixedit.h -o pmpovraymatrixedit.moc
++pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
++ $(MOC) $(srcdir)/pmboundedbyedit.h -o pmboundedbyedit.moc
+
+ #>+ 2
+-mocs: pmpovraymatrixedit.moc
++mocs: pmboundedbyedit.moc
+
+ #>+ 3
+-pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
+- $(MOC) $(srcdir)/pmboundedbyedit.h -o pmboundedbyedit.moc
++pmpovraymatrixedit.moc: $(srcdir)/pmpovraymatrixedit.h
++ $(MOC) $(srcdir)/pmpovraymatrixedit.h -o pmpovraymatrixedit.moc
+
+ #>+ 2
+-mocs: pmboundedbyedit.moc
++mocs: pmpovraymatrixedit.moc
+
+ #>+ 3
+ pmlistpatternedit.moc: $(srcdir)/pmlistpatternedit.h
+@@ -2092,18 +2107,18 @@
+ mocs: pmpigmentedit.moc
+
+ #>+ 3
+-pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
+- $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
++pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
++ $(MOC) $(srcdir)/pmglobalsettingsedit.h -o pmglobalsettingsedit.moc
+
+ #>+ 2
+-mocs: pmglobalphotonsedit.moc
++mocs: pmglobalsettingsedit.moc
+
+ #>+ 3
+-pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
+- $(MOC) $(srcdir)/pmglobalsettingsedit.h -o pmglobalsettingsedit.moc
++pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
++ $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
+
+ #>+ 2
+-mocs: pmglobalsettingsedit.moc
++mocs: pmglobalphotonsedit.moc
+
+ #>+ 3
+ pmerrordialog.moc: $(srcdir)/pmerrordialog.h
+@@ -2148,13 +2163,6 @@
+ mocs: pmconeedit.moc
+
+ #>+ 3
+-pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
+- $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
+-
+-#>+ 2
+-mocs: pmphotonsedit.moc
+-
+-#>+ 3
+ pmpatternedit.moc: $(srcdir)/pmpatternedit.h
+ $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
+
+@@ -2162,11 +2170,11 @@
+ mocs: pmpatternedit.moc
+
+ #>+ 3
+-pmsoredit.moc: $(srcdir)/pmsoredit.h
+- $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
++pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
++ $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
+
+ #>+ 2
+-mocs: pmsoredit.moc
++mocs: pmphotonsedit.moc
+
+ #>+ 3
+ pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
+@@ -2176,6 +2184,13 @@
+ mocs: pmrainbowedit.moc
+
+ #>+ 3
++pmsoredit.moc: $(srcdir)/pmsoredit.h
++ $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
++
++#>+ 2
++mocs: pmsoredit.moc
++
++#>+ 3
+ pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
+ $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
+
+@@ -2190,18 +2205,18 @@
+ mocs: pmdeclareedit.moc
+
+ #>+ 3
+-pmsqeedit.moc: $(srcdir)/pmsqeedit.h
+- $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
++pmdialogview.moc: $(srcdir)/pmdialogview.h
++ $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
+
+ #>+ 2
+-mocs: pmsqeedit.moc
++mocs: pmdialogview.moc
+
+ #>+ 3
+-pmdialogview.moc: $(srcdir)/pmdialogview.h
+- $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
++pmsqeedit.moc: $(srcdir)/pmsqeedit.h
++ $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
+
+ #>+ 2
+-mocs: pmdialogview.moc
++mocs: pmsqeedit.moc
+
+ #>+ 3
+ pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
+@@ -2211,6 +2226,13 @@
+ mocs: pmbicubicpatchedit.moc
+
+ #>+ 3
++pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
++ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
++
++#>+ 2
++mocs: pmobjectlinkedit.moc
++
++#>+ 3
+ pmcoloredit.moc: $(srcdir)/pmcoloredit.h
+ $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
+
+@@ -2225,13 +2247,6 @@
+ mocs: pmglview.moc
+
+ #>+ 3
+-pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
+- $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
+-
+-#>+ 2
+-mocs: pmobjectlinkedit.moc
+-
+-#>+ 3
+ pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
+ $(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
+
+@@ -2302,18 +2317,18 @@
+ mocs: pmnormaledit.moc
+
+ #>+ 3
+-pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
+- $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
++pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
++ $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
+
+ #>+ 2
+-mocs: pmgraphicalobjectedit.moc
++mocs: pmlibraryobjectsearch.moc
+
+ #>+ 3
+-pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
+- $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
++pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
++ $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
+
+ #>+ 2
+-mocs: pmlibraryobjectsearch.moc
++mocs: pmgraphicalobjectedit.moc
+
+ #>+ 3
+ pmprismedit.moc: $(srcdir)/pmprismedit.h
+@@ -2358,18 +2373,18 @@
+ mocs: pmdockwidget.moc
+
+ #>+ 3
+-pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
+- $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
++pmgridsettings.moc: $(srcdir)/pmgridsettings.h
++ $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
+
+ #>+ 2
+-mocs: pmdetailobjectedit.moc
++mocs: pmgridsettings.moc
+
+ #>+ 3
+-pmgridsettings.moc: $(srcdir)/pmgridsettings.h
+- $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
++pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
++ $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
+
+ #>+ 2
+-mocs: pmgridsettings.moc
++mocs: pmdetailobjectedit.moc
+
+ #>+ 3
+ pmrendermanager.moc: $(srcdir)/pmrendermanager.h
+@@ -2414,18 +2429,18 @@
+ mocs: pmvectoredit.moc
+
+ #>+ 3
+-pmtextureedit.moc: $(srcdir)/pmtextureedit.h
+- $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
++pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
++ $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
+
+ #>+ 2
+-mocs: pmtextureedit.moc
++mocs: pmpovraywidget.moc
+
+ #>+ 3
+-pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
+- $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
++pmtextureedit.moc: $(srcdir)/pmtextureedit.h
++ $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
+
+ #>+ 2
+-mocs: pmpovraywidget.moc
++mocs: pmtextureedit.moc
+
+ #>+ 3
+ pmrotateedit.moc: $(srcdir)/pmrotateedit.h
+@@ -2463,18 +2478,18 @@
+ mocs: pmsolidobjectedit.moc
+
+ #>+ 3
+-pmshell.moc: $(srcdir)/pmshell.h
+- $(MOC) $(srcdir)/pmshell.h -o pmshell.moc
++pmfogedit.moc: $(srcdir)/pmfogedit.h
++ $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
+
+ #>+ 2
+-mocs: pmshell.moc
++mocs: pmfogedit.moc
+
+ #>+ 3
+-pmfogedit.moc: $(srcdir)/pmfogedit.h
+- $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
++pmshell.moc: $(srcdir)/pmshell.h
++ $(MOC) $(srcdir)/pmshell.h -o pmshell.moc
+
+ #>+ 2
+-mocs: pmfogedit.moc
++mocs: pmshell.moc
+
+ #>+ 3
+ pmsettingsdialog.moc: $(srcdir)/pmsettingsdialog.h
+@@ -2543,7 +2558,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmlayoutsettings.moc pmblobsphereedit.moc pmboxedit.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmradiosityedit.moc pmlightgroupedit.moc pmdragwidget.moc pmactions.moc pmlibrarybrowser.moc pmdiscedit.moc pmpalettevalueedit.moc pmlightedit.moc pmview.moc pmobjectlibrarysettings.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmpovraymatrixedit.moc pmboundedbyedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalphotonsedit.moc pmglobalsettingsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmphotonsedit.moc pmpatternedit.moc pmsoredit.moc pmrainbowedit.moc pmquickcoloredit.moc pmdeclareedit.moc pmsqeedit.moc pmdialogview.moc pmbicubicpatchedit.moc pmcoloredit.moc pmglview.moc pmobjectlinkedit.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmgraphicalobjectedit.moc pmlibraryobjectsearch.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmdetailobjectedit.moc pmgridsettings.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmtextureedit.moc pmpovraywidget.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmshell.moc pmfogedit.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
++ -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pminteriortextureedit.moc pmtorusedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmblobsphereedit.moc pmboxedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmimagemapedit.moc pmlibraryiconview.moc pmdragwidget.moc pmlightgroupedit.moc pmradiosityedit.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmlightedit.moc pmpalettevalueedit.moc pmobjectlibrarysettings.moc pmview.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalsettingsedit.moc pmglobalphotonsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmpatternedit.moc pmphotonsedit.moc pmrainbowedit.moc pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmdialogview.moc pmsqeedit.moc pmbicubicpatchedit.moc pmobjectlinkedit.moc pmcoloredit.moc pmglview.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmlibraryobjectsearch.moc pmgraphicalobjectedit.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmpovraywidget.moc pmtextureedit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmfogedit.moc pmshell.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
+
+ #>+ 2
+ KDE_DIST=lo16-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h lo32-app-kpovmodeler.png Makefile.in cr32-app-kpovmodeler.png povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png kpovmodelerui.rc cr16-app-kpovmodeler.png cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc cr48-app-kpovmodeler.png pminsertrules.dtd
+@@ -2562,31 +2577,31 @@
+
+ #>+ 28
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
+- $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/lo32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+
+ #>+ 15
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/Makefile.in
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/Makefile.in 2005-03-05 02:51:50.705884317 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17516,7 +17856,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,6 +206,9 @@
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17526,8 +17866,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am all-am
+@@ -398,7 +401,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -17535,7 +17875,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17547,23 +17887,61 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -628,7 +631,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; \
+@@ -458,7 +461,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 \
+@@ -470,7 +479,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; \
+@@ -478,7 +487,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)' ;; \
+@@ -499,7 +514,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/includes/Makefile.in 2005-03-03 04:16:32.229072262 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/includes/Makefile.in 2005-03-05 02:51:50.713882945 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17651,23 +18029,59 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/inlined/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/inlined/Makefile.in
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/inlined/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/includes/inlined/Makefile.in 2005-03-05 02:51:50.721881574 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -206,6 +206,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@
+@@ -396,7 +399,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*) \
+@@ -434,9 +437,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:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/original/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/includes/original/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/original/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/includes/original/Makefile.in 2005-03-03 04:16:32.245069500 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/includes/original/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/includes/original/Makefile.in 2005-03-05 02:51:50.728880374 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17707,23 +18121,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -628,7 +631,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/Makefile.in 2005-03-03 04:16:32.221073642 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/Makefile.in
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/Makefile.in 2005-03-05 02:51:50.742877973 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17811,23 +18215,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/advanced/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/advanced/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-03-03 04:16:32.261066739 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/advanced/Makefile.in 2005-03-05 02:51:50.755875745 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17867,23 +18261,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/csg/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/csg/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/csg/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/csg/Makefile.in 2005-03-03 04:16:32.269065358 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/csg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/csg/Makefile.in 2005-03-05 02:51:50.762874545 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17923,23 +18307,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/interior/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/interior/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/interior/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/interior/Makefile.in 2005-03-03 04:16:32.276064150 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/interior/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/interior/Makefile.in 2005-03-05 02:51:50.769873345 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17979,23 +18353,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/lights/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/lights/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/lights/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/lights/Makefile.in 2005-03-03 04:16:32.292061389 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/lights/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/lights/Makefile.in 2005-03-05 02:51:50.776872144 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18035,127 +18399,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/Makefile.in 2005-03-03 04:16:32.254067947 +0100
-@@ -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.2 $
- # @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.
-@@ -212,6 +212,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@
-@@ -398,7 +401,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*) \
-@@ -436,9 +439,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:
-@@ -458,7 +461,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 \
-@@ -470,7 +479,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; \
-@@ -478,7 +487,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)' ;; \
-@@ -499,7 +514,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 \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/objects/Makefile.in kdegraphics-3.4.0/kpovmodeler/examples/scenes/objects/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/objects/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/objects/Makefile.in 2005-03-03 04:16:32.300060008 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/examples/scenes/objects/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/examples/scenes/objects/Makefile.in 2005-03-05 02:51:50.807866830 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18195,23 +18445,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -627,7 +630,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/Makefile.in kdegraphics-3.4.0/kpovmodeler/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/Makefile.in 2005-03-03 04:16:32.212075195 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/Makefile.in
+--- kdegraphics-3.4.0.orig/kpovmodeler/pics/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/pics/Makefile.in 2005-03-05 02:51:50.815865458 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18220,30 +18460,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.
-@@ -256,18 +256,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 = $(libkpovmodeler_la_SOURCES) \
- $(libkpovmodelerpart_la_SOURCES) $(kpovmodeler_SOURCES)
-@@ -440,6 +440,9 @@
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18253,16 +18470,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -954,7 +957,7 @@
+@@ -398,7 +401,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*) \
-@@ -992,9 +995,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18272,9 +18489,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_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -1428,7 +1431,13 @@
+
+ mostlyclean-libtool:
+@@ -458,7 +461,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):
@@ -18289,7 +18506,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1440,7 +1449,7 @@
+@@ -470,7 +479,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -18298,7 +18515,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1448,7 +1457,13 @@
+@@ -478,7 +487,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -18313,7 +18530,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1469,7 +1484,7 @@
+@@ -499,7 +514,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -18322,471 +18539,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1756,18 +1771,18 @@
- mocs: pmcylinderedit.moc
-
- #>+ 3
--pmtorusedit.moc: $(srcdir)/pmtorusedit.h
-- $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
-+pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
-+ $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
-
- #>+ 2
--mocs: pmtorusedit.moc
-+mocs: pminteriortextureedit.moc
-
- #>+ 3
--pminteriortextureedit.moc: $(srcdir)/pminteriortextureedit.h
-- $(MOC) $(srcdir)/pminteriortextureedit.h -o pminteriortextureedit.moc
-+pmtorusedit.moc: $(srcdir)/pmtorusedit.h
-+ $(MOC) $(srcdir)/pmtorusedit.h -o pmtorusedit.moc
-
- #>+ 2
--mocs: pminteriortextureedit.moc
-+mocs: pmtorusedit.moc
-
- #>+ 3
- pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1826,13 +1841,6 @@
- mocs: pmcameraedit.moc
-
- #>+ 3
--pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-- $(MOC) $(srcdir)/pmlayoutsettings.h -o pmlayoutsettings.moc
--
--#>+ 2
--mocs: pmlayoutsettings.moc
--
--#>+ 3
- pmblobsphereedit.moc: $(srcdir)/pmblobsphereedit.h
- $(MOC) $(srcdir)/pmblobsphereedit.h -o pmblobsphereedit.moc
-
-@@ -1847,6 +1855,13 @@
- mocs: pmboxedit.moc
-
- #>+ 3
-+pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-+ $(MOC) $(srcdir)/pmlayoutsettings.h -o pmlayoutsettings.moc
-+
-+#>+ 2
-+mocs: pmlayoutsettings.moc
-+
-+#>+ 3
- pmspheresweepedit.moc: $(srcdir)/pmspheresweepedit.h
- $(MOC) $(srcdir)/pmspheresweepedit.h -o pmspheresweepedit.moc
-
-@@ -1861,25 +1876,25 @@
- mocs: pmdockwidget_private.moc
-
- #>+ 3
--pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
-- $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
-+pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
-+ $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
-
- #>+ 2
--mocs: pmlibraryiconview.moc
-+mocs: pmimagemapedit.moc
-
- #>+ 3
--pmimagemapedit.moc: $(srcdir)/pmimagemapedit.h
-- $(MOC) $(srcdir)/pmimagemapedit.h -o pmimagemapedit.moc
-+pmlibraryiconview.moc: $(srcdir)/pmlibraryiconview.h
-+ $(MOC) $(srcdir)/pmlibraryiconview.h -o pmlibraryiconview.moc
-
- #>+ 2
--mocs: pmimagemapedit.moc
-+mocs: pmlibraryiconview.moc
-
- #>+ 3
--pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
-- $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
-+pmdragwidget.moc: $(srcdir)/pmdragwidget.h
-+ $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
-
- #>+ 2
--mocs: pmradiosityedit.moc
-+mocs: pmdragwidget.moc
-
- #>+ 3
- pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1889,11 +1904,11 @@
- mocs: pmlightgroupedit.moc
-
- #>+ 3
--pmdragwidget.moc: $(srcdir)/pmdragwidget.h
-- $(MOC) $(srcdir)/pmdragwidget.h -o pmdragwidget.moc
-+pmradiosityedit.moc: $(srcdir)/pmradiosityedit.h
-+ $(MOC) $(srcdir)/pmradiosityedit.h -o pmradiosityedit.moc
-
- #>+ 2
--mocs: pmdragwidget.moc
-+mocs: pmradiosityedit.moc
-
- #>+ 3
- pmactions.moc: $(srcdir)/pmactions.h
-@@ -1903,13 +1918,6 @@
- mocs: pmactions.moc
-
- #>+ 3
--pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
-- $(MOC) $(srcdir)/pmlibrarybrowser.h -o pmlibrarybrowser.moc
--
--#>+ 2
--mocs: pmlibrarybrowser.moc
--
--#>+ 3
- pmdiscedit.moc: $(srcdir)/pmdiscedit.h
- $(MOC) $(srcdir)/pmdiscedit.h -o pmdiscedit.moc
-
-@@ -1917,11 +1925,11 @@
- mocs: pmdiscedit.moc
-
- #>+ 3
--pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
-- $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
-+pmlibrarybrowser.moc: $(srcdir)/pmlibrarybrowser.h
-+ $(MOC) $(srcdir)/pmlibrarybrowser.h -o pmlibrarybrowser.moc
-
- #>+ 2
--mocs: pmpalettevalueedit.moc
-+mocs: pmlibrarybrowser.moc
-
- #>+ 3
- pmlightedit.moc: $(srcdir)/pmlightedit.h
-@@ -1931,11 +1939,11 @@
- mocs: pmlightedit.moc
-
- #>+ 3
--pmview.moc: $(srcdir)/pmview.h
-- $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+pmpalettevalueedit.moc: $(srcdir)/pmpalettevalueedit.h
-+ $(MOC) $(srcdir)/pmpalettevalueedit.h -o pmpalettevalueedit.moc
-
- #>+ 2
--mocs: pmview.moc
-+mocs: pmpalettevalueedit.moc
-
- #>+ 3
- pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1945,6 +1953,13 @@
- mocs: pmobjectlibrarysettings.moc
-
- #>+ 3
-+pmview.moc: $(srcdir)/pmview.h
-+ $(MOC) $(srcdir)/pmview.h -o pmview.moc
-+
-+#>+ 2
-+mocs: pmview.moc
-+
-+#>+ 3
- pmfactory.moc: $(srcdir)/pmfactory.h
- $(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
-
-@@ -2036,18 +2051,18 @@
- mocs: pmfiledialog.moc
-
- #>+ 3
--pmpovraymatrixedit.moc: $(srcdir)/pmpovraymatrixedit.h
-- $(MOC) $(srcdir)/pmpovraymatrixedit.h -o pmpovraymatrixedit.moc
-+pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-+ $(MOC) $(srcdir)/pmboundedbyedit.h -o pmboundedbyedit.moc
-
- #>+ 2
--mocs: pmpovraymatrixedit.moc
-+mocs: pmboundedbyedit.moc
-
- #>+ 3
--pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-- $(MOC) $(srcdir)/pmboundedbyedit.h -o pmboundedbyedit.moc
-+pmpovraymatrixedit.moc: $(srcdir)/pmpovraymatrixedit.h
-+ $(MOC) $(srcdir)/pmpovraymatrixedit.h -o pmpovraymatrixedit.moc
-
- #>+ 2
--mocs: pmboundedbyedit.moc
-+mocs: pmpovraymatrixedit.moc
-
- #>+ 3
- pmlistpatternedit.moc: $(srcdir)/pmlistpatternedit.h
-@@ -2092,18 +2107,18 @@
- mocs: pmpigmentedit.moc
-
- #>+ 3
--pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
-- $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
-+pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
-+ $(MOC) $(srcdir)/pmglobalsettingsedit.h -o pmglobalsettingsedit.moc
-
- #>+ 2
--mocs: pmglobalphotonsedit.moc
-+mocs: pmglobalsettingsedit.moc
-
- #>+ 3
--pmglobalsettingsedit.moc: $(srcdir)/pmglobalsettingsedit.h
-- $(MOC) $(srcdir)/pmglobalsettingsedit.h -o pmglobalsettingsedit.moc
-+pmglobalphotonsedit.moc: $(srcdir)/pmglobalphotonsedit.h
-+ $(MOC) $(srcdir)/pmglobalphotonsedit.h -o pmglobalphotonsedit.moc
-
- #>+ 2
--mocs: pmglobalsettingsedit.moc
-+mocs: pmglobalphotonsedit.moc
-
- #>+ 3
- pmerrordialog.moc: $(srcdir)/pmerrordialog.h
-@@ -2148,13 +2163,6 @@
- mocs: pmconeedit.moc
-
- #>+ 3
--pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
-- $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
--
--#>+ 2
--mocs: pmphotonsedit.moc
--
--#>+ 3
- pmpatternedit.moc: $(srcdir)/pmpatternedit.h
- $(MOC) $(srcdir)/pmpatternedit.h -o pmpatternedit.moc
-
-@@ -2162,11 +2170,11 @@
- mocs: pmpatternedit.moc
-
- #>+ 3
--pmsoredit.moc: $(srcdir)/pmsoredit.h
-- $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-+pmphotonsedit.moc: $(srcdir)/pmphotonsedit.h
-+ $(MOC) $(srcdir)/pmphotonsedit.h -o pmphotonsedit.moc
-
- #>+ 2
--mocs: pmsoredit.moc
-+mocs: pmphotonsedit.moc
-
- #>+ 3
- pmrainbowedit.moc: $(srcdir)/pmrainbowedit.h
-@@ -2176,6 +2184,13 @@
- mocs: pmrainbowedit.moc
-
- #>+ 3
-+pmsoredit.moc: $(srcdir)/pmsoredit.h
-+ $(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
-+
-+#>+ 2
-+mocs: pmsoredit.moc
-+
-+#>+ 3
- pmquickcoloredit.moc: $(srcdir)/pmquickcoloredit.h
- $(MOC) $(srcdir)/pmquickcoloredit.h -o pmquickcoloredit.moc
-
-@@ -2190,18 +2205,18 @@
- mocs: pmdeclareedit.moc
-
- #>+ 3
--pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-- $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
-+pmdialogview.moc: $(srcdir)/pmdialogview.h
-+ $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
-
- #>+ 2
--mocs: pmsqeedit.moc
-+mocs: pmdialogview.moc
-
- #>+ 3
--pmdialogview.moc: $(srcdir)/pmdialogview.h
-- $(MOC) $(srcdir)/pmdialogview.h -o pmdialogview.moc
-+pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-+ $(MOC) $(srcdir)/pmsqeedit.h -o pmsqeedit.moc
-
- #>+ 2
--mocs: pmdialogview.moc
-+mocs: pmsqeedit.moc
-
- #>+ 3
- pmbicubicpatchedit.moc: $(srcdir)/pmbicubicpatchedit.h
-@@ -2211,6 +2226,13 @@
- mocs: pmbicubicpatchedit.moc
-
- #>+ 3
-+pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
-+ $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
-+
-+#>+ 2
-+mocs: pmobjectlinkedit.moc
-+
-+#>+ 3
- pmcoloredit.moc: $(srcdir)/pmcoloredit.h
- $(MOC) $(srcdir)/pmcoloredit.h -o pmcoloredit.moc
-
-@@ -2225,13 +2247,6 @@
- mocs: pmglview.moc
-
- #>+ 3
--pmobjectlinkedit.moc: $(srcdir)/pmobjectlinkedit.h
-- $(MOC) $(srcdir)/pmobjectlinkedit.h -o pmobjectlinkedit.moc
--
--#>+ 2
--mocs: pmobjectlinkedit.moc
--
--#>+ 3
- pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
- $(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
-
-@@ -2302,18 +2317,18 @@
- mocs: pmnormaledit.moc
-
- #>+ 3
--pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
-- $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
-+pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
-+ $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
-
- #>+ 2
--mocs: pmgraphicalobjectedit.moc
-+mocs: pmlibraryobjectsearch.moc
-
- #>+ 3
--pmlibraryobjectsearch.moc: $(srcdir)/pmlibraryobjectsearch.h
-- $(MOC) $(srcdir)/pmlibraryobjectsearch.h -o pmlibraryobjectsearch.moc
-+pmgraphicalobjectedit.moc: $(srcdir)/pmgraphicalobjectedit.h
-+ $(MOC) $(srcdir)/pmgraphicalobjectedit.h -o pmgraphicalobjectedit.moc
-
- #>+ 2
--mocs: pmlibraryobjectsearch.moc
-+mocs: pmgraphicalobjectedit.moc
-
- #>+ 3
- pmprismedit.moc: $(srcdir)/pmprismedit.h
-@@ -2358,18 +2373,18 @@
- mocs: pmdockwidget.moc
-
- #>+ 3
--pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
-- $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
-+pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-+ $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
-
- #>+ 2
--mocs: pmdetailobjectedit.moc
-+mocs: pmgridsettings.moc
-
- #>+ 3
--pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-- $(MOC) $(srcdir)/pmgridsettings.h -o pmgridsettings.moc
-+pmdetailobjectedit.moc: $(srcdir)/pmdetailobjectedit.h
-+ $(MOC) $(srcdir)/pmdetailobjectedit.h -o pmdetailobjectedit.moc
-
- #>+ 2
--mocs: pmgridsettings.moc
-+mocs: pmdetailobjectedit.moc
-
- #>+ 3
- pmrendermanager.moc: $(srcdir)/pmrendermanager.h
-@@ -2414,18 +2429,18 @@
- mocs: pmvectoredit.moc
-
- #>+ 3
--pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-- $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
-+pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
-+ $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
-
- #>+ 2
--mocs: pmtextureedit.moc
-+mocs: pmpovraywidget.moc
-
- #>+ 3
--pmpovraywidget.moc: $(srcdir)/pmpovraywidget.h
-- $(MOC) $(srcdir)/pmpovraywidget.h -o pmpovraywidget.moc
-+pmtextureedit.moc: $(srcdir)/pmtextureedit.h
-+ $(MOC) $(srcdir)/pmtextureedit.h -o pmtextureedit.moc
-
- #>+ 2
--mocs: pmpovraywidget.moc
-+mocs: pmtextureedit.moc
-
- #>+ 3
- pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2463,18 +2478,18 @@
- mocs: pmsolidobjectedit.moc
-
- #>+ 3
--pmshell.moc: $(srcdir)/pmshell.h
-- $(MOC) $(srcdir)/pmshell.h -o pmshell.moc
-+pmfogedit.moc: $(srcdir)/pmfogedit.h
-+ $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
-
- #>+ 2
--mocs: pmshell.moc
-+mocs: pmfogedit.moc
-
- #>+ 3
--pmfogedit.moc: $(srcdir)/pmfogedit.h
-- $(MOC) $(srcdir)/pmfogedit.h -o pmfogedit.moc
-+pmshell.moc: $(srcdir)/pmshell.h
-+ $(MOC) $(srcdir)/pmshell.h -o pmshell.moc
-
- #>+ 2
--mocs: pmfogedit.moc
-+mocs: pmshell.moc
-
- #>+ 3
- pmsettingsdialog.moc: $(srcdir)/pmsettingsdialog.h
-@@ -2543,7 +2558,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pmtorusedit.moc pminteriortextureedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmlayoutsettings.moc pmblobsphereedit.moc pmboxedit.moc pmspheresweepedit.moc pmdockwidget_private.moc pmlibraryiconview.moc pmimagemapedit.moc pmradiosityedit.moc pmlightgroupedit.moc pmdragwidget.moc pmactions.moc pmlibrarybrowser.moc pmdiscedit.moc pmpalettevalueedit.moc pmlightedit.moc pmview.moc pmobjectlibrarysettings.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmpovraymatrixedit.moc pmboundedbyedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalphotonsedit.moc pmglobalsettingsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmphotonsedit.moc pmpatternedit.moc pmsoredit.moc pmrainbowedit.moc pmquickcoloredit.moc pmdeclareedit.moc pmsqeedit.moc pmdialogview.moc pmbicubicpatchedit.moc pmcoloredit.moc pmglview.moc pmobjectlinkedit.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmgraphicalobjectedit.moc pmlibraryobjectsearch.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmdetailobjectedit.moc pmgridsettings.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmtextureedit.moc pmpovraywidget.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmshell.moc pmfogedit.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
-+ -rm -f pmblobcylinderedit.moc pmlineedits.moc pmcylinderedit.moc pminteriortextureedit.moc pmtorusedit.moc pmblobedit.moc pmpreviewsettings.moc pmpovrayoutputwidget.moc pmpluginsettings.moc pmobjectselect.moc pmviewlayoutmanager.moc pmlibraryentrypreview.moc pmcameraedit.moc pmblobsphereedit.moc pmboxedit.moc pmlayoutsettings.moc pmspheresweepedit.moc pmdockwidget_private.moc pmimagemapedit.moc pmlibraryiconview.moc pmdragwidget.moc pmlightgroupedit.moc pmradiosityedit.moc pmactions.moc pmdiscedit.moc pmlibrarybrowser.moc pmlightedit.moc pmpalettevalueedit.moc pmobjectlibrarysettings.moc pmview.moc pmfactory.moc pmpolynomedit.moc pmdensityedit.moc pmlatheedit.moc pmlibraryhandleedit.moc pminterioredit.moc pmclippedbyedit.moc pmtexturemapedit.moc pmpovraysettings.moc pmtexturebaseedit.moc pmdialogeditbase.moc pmslopeedit.moc pmfiledialog.moc pmboundedbyedit.moc pmpovraymatrixedit.moc pmlistpatternedit.moc pmwarpedit.moc pmopenglsettings.moc pmcsgedit.moc pmplaneedit.moc pmpigmentedit.moc pmglobalsettingsedit.moc pmglobalphotonsedit.moc pmerrordialog.moc pmtriangleedit.moc pminserterrordialog.moc pmfinishedit.moc pmsphereedit.moc pmconeedit.moc pmpatternedit.moc pmphotonsedit.moc pmrainbowedit.moc pmsoredit.moc pmquickcoloredit.moc pmdeclareedit.moc pmdialogview.moc pmsqeedit.moc pmbicubicpatchedit.moc pmobjectlinkedit.moc pmcoloredit.moc pmglview.moc pmmaterialedit.moc pmrawedit.moc pmbumpmapedit.moc pmskysphereedit.moc pmmediaedit.moc pmobjectsettings.moc pmlinkedit.moc pmcolorsettings.moc pmjuliafractaledit.moc pmnormaledit.moc pmlibraryobjectsearch.moc pmgraphicalobjectedit.moc pmprismedit.moc pmtextedit.moc pmisosurfaceedit.moc pmpovrayrenderwidget.moc pmviewbase.moc pmdockwidget.moc pmgridsettings.moc pmdetailobjectedit.moc pmrendermanager.moc pmsolidcoloredit.moc pmpart.moc pmheightfieldedit.moc pmmaterialmapedit.moc pmvectoredit.moc pmpovraywidget.moc pmtextureedit.moc pmrotateedit.moc pmtreeview.moc pmtranslateedit.moc pmvectorlistedit.moc pmsolidobjectedit.moc pmfogedit.moc pmshell.moc pmsettingsdialog.moc pmcommandmanager.moc pmblendmapmodifiersedit.moc pmrendermodesdialog.moc pmmeshedit.moc pmnamedobjectedit.moc pmcommentedit.moc pmscaleedit.moc
-
- #>+ 2
- KDE_DIST=lo16-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h lo32-app-kpovmodeler.png Makefile.in cr32-app-kpovmodeler.png povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png kpovmodelerui.rc cr16-app-kpovmodeler.png cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc cr48-app-kpovmodeler.png pminsertrules.dtd
-@@ -2562,31 +2577,31 @@
-
- #>+ 28
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr16-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
-- $(INSTALL_DATA) $(srcdir)/cr32-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/lo16-app-kpovmodeler.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
- $(INSTALL_DATA) $(srcdir)/cr48-mime-kpovmodeler_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpovmodeler.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpovmodeler.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kpovmodeler.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-
- #>+ 15
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/crystalsvg/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/crystalsvg/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/pics/crystalsvg/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/pics/crystalsvg/Makefile.in 2005-03-03 04:16:32.351051207 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/pics/crystalsvg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/pics/crystalsvg/Makefile.in 2005-03-05 02:51:50.866856715 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19705,23 +19464,13 @@
#>+ 15
force-reedit:
-@@ -1062,7 +1065,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/locolor/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/locolor/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/pics/locolor/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/pics/locolor/Makefile.in 2005-03-03 04:16:32.369048100 +0100
+--- kdegraphics-3.4.0.orig/kpovmodeler/pics/locolor/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kpovmodeler/pics/locolor/Makefile.in 2005-03-05 02:51:50.885853457 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20040,127 +19789,13 @@
#>+ 15
force-reedit:
-@@ -753,7 +756,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kpovmodeler/pics/Makefile.in kdegraphics-3.4.0/kpovmodeler/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kpovmodeler/pics/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kpovmodeler/pics/Makefile.in 2005-03-03 04:16:32.311058110 +0100
-@@ -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.2 $
- # @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.
-@@ -212,6 +212,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@
-@@ -398,7 +401,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*) \
-@@ -436,9 +439,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:
-@@ -458,7 +461,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 \
-@@ -470,7 +479,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; \
-@@ -478,7 +487,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)' ;; \
-@@ -499,7 +514,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 \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kruler/Makefile.in kdegraphics-3.4.0/kruler/Makefile.in
---- kdegraphics-3.4.0.orig/kruler/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kruler/Makefile.in 2005-03-03 04:16:32.422038954 +0100
+--- kdegraphics-3.4.0.orig/kruler/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kruler/Makefile.in 2005-03-05 02:51:50.924846771 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20272,13 +19907,12 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kruler/pics/Makefile.in kdegraphics-3.4.0/kruler/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kruler/pics/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/kruler/pics/Makefile.in 2005-03-03 04:16:32.431037401 +0100
+--- kdegraphics-3.4.0.orig/kruler/pics/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kruler/pics/Makefile.in 2005-03-05 02:51:50.939844200 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20338,23 +19972,13 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kruler.png
#>+ 15
-@@ -644,7 +647,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksnapshot/Makefile.in kdegraphics-3.4.0/ksnapshot/Makefile.in
---- kdegraphics-3.4.0.orig/ksnapshot/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksnapshot/Makefile.in 2005-03-03 04:16:32.464031705 +0100
+--- kdegraphics-3.4.0.orig/ksnapshot/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksnapshot/Makefile.in 2005-03-05 02:51:50.997834256 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20443,14 +20067,130 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
#>+ 15
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/Makefile.in kdegraphics-3.4.0/ksvg/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/Makefile.in 2005-03-05 02:51:51.058823798 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -80,18 +80,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 = $(libksvg_la_SOURCES)
+ DIST_SOURCES = $(libksvg_la_SOURCES)
+@@ -258,6 +258,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 @@
+
+ .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*) \
+@@ -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
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -577,7 +580,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 \
+@@ -589,7 +598,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; \
+@@ -597,7 +606,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)' ;; \
+@@ -618,7 +633,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/core/Makefile.in kdegraphics-3.4.0/ksvg/core/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/core/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/core/Makefile.in 2005-03-03 04:16:32.532019970 +0100
+--- kdegraphics-3.4.0.orig/ksvg/core/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/core/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20514,13 +20254,12 @@
clean-noinstLTLIBRARIES:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/dom/Makefile.in kdegraphics-3.4.0/ksvg/dom/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/dom/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/dom/Makefile.in 2005-03-03 04:16:32.847965435 +0100
+--- kdegraphics-3.4.0.orig/ksvg/dom/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/dom/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20584,13 +20323,12 @@
clean-noinstLTLIBRARIES:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/ecma/Makefile.in kdegraphics-3.4.0/ksvg/ecma/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/ecma/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/ecma/Makefile.in 2005-03-03 04:16:32.880959740 +0100
+--- kdegraphics-3.4.0.orig/ksvg/ecma/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/ecma/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20653,14 +20391,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/art_support/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/art_support/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/art_support/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/art_support/Makefile.in 2005-03-03 04:16:33.595836346 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/Makefile.in kdegraphics-3.4.0/ksvg/impl/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/impl/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/impl/Makefile.in 2005-03-05 02:51:51.432759679 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20669,21 +20406,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.
-@@ -66,11 +66,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) \
+@@ -220,18 +220,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_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 = $(libksvgart_la_SOURCES)
- DIST_SOURCES = $(libksvgart_la_SOURCES)
-@@ -223,6 +223,9 @@
+ $(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 = $(libksvgdomimpl_la_SOURCES)
+ DIST_SOURCES = $(libksvgdomimpl_la_SOURCES)
+@@ -398,6 +398,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20693,16 +20439,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -697,7 +700,7 @@
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -735,9 +738,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20714,23 +20460,99 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -716,7 +719,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/Makefile.in 2005-03-03 04:16:33.603834965 +0100
+@@ -974,7 +977,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 \
+@@ -986,7 +995,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; \
+@@ -994,7 +1003,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)' ;; \
+@@ -1015,7 +1030,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 \
+@@ -1242,18 +1257,18 @@
+ mocs: SVGScriptElementImpl.moc
+
+ #>+ 3
+-SVGImageElementImpl.moc: $(srcdir)/SVGImageElementImpl.h
+- $(MOC) $(srcdir)/SVGImageElementImpl.h -o SVGImageElementImpl.moc
++SVGDocumentImpl.moc: $(srcdir)/SVGDocumentImpl.h
++ $(MOC) $(srcdir)/SVGDocumentImpl.h -o SVGDocumentImpl.moc
+
+ #>+ 2
+-mocs: SVGImageElementImpl.moc
++mocs: SVGDocumentImpl.moc
+
+ #>+ 3
+-SVGDocumentImpl.moc: $(srcdir)/SVGDocumentImpl.h
+- $(MOC) $(srcdir)/SVGDocumentImpl.h -o SVGDocumentImpl.moc
++SVGImageElementImpl.moc: $(srcdir)/SVGImageElementImpl.h
++ $(MOC) $(srcdir)/SVGImageElementImpl.h -o SVGImageElementImpl.moc
+
+ #>+ 2
+-mocs: SVGDocumentImpl.moc
++mocs: SVGImageElementImpl.moc
+
+ #>+ 3
+ SVGTimeScheduler.moc: $(srcdir)/SVGTimeScheduler.h
+@@ -1264,10 +1279,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f SVGScriptElementImpl.moc SVGImageElementImpl.moc SVGDocumentImpl.moc SVGTimeScheduler.moc
++ -rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
+
+ #>+ 2
+-KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedPathDataImpl.h SVGAnimatedEnumerationImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGZoomEventImpl.h SVGVKernElementImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGScriptElementImpl.h SVGDocumentImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGLangSpaceImpl.h SVGFEBlendElementImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
++KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
+
+ #>+ 2
+ docs-am:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/impl/libs/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/impl/libs/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20749,7 +20571,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -398,7 +401,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20758,7 +20580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20770,7 +20592,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -459,7 +462,13 @@
+@@ -458,7 +461,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):
@@ -20785,7 +20607,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
+@@ -470,7 +479,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20794,7 +20616,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
+@@ -478,7 +487,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -20809,7 +20631,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
+@@ -499,7 +514,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20818,23 +20640,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -752,7 +767,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/src/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/src/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-03-03 04:16:33.615832894 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/art_support/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/art_support/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/impl/libs/art_support/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/impl/libs/art_support/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20843,30 +20655,21 @@
# This Makefile.in is free software; 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 @@
- #>+ 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) \
+@@ -66,11 +66,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_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 = $(libtext2path_la_SOURCES)
- DIST_SOURCES = $(libtext2path_la_SOURCES)
-@@ -246,6 +246,9 @@
+ $(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 = $(libksvgart_la_SOURCES)
+ DIST_SOURCES = $(libksvgart_la_SOURCES)
+@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20876,16 +20679,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -412,7 +415,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -450,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20895,16 +20698,15 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/Makefile.in 2005-03-03 04:16:33.584838244 +0100
+
+ clean-noinstLTLIBRARIES:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20923,7 +20725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
+@@ -399,7 +402,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20932,7 +20734,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -437,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20944,7 +20746,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -458,7 +461,13 @@
+@@ -459,7 +462,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):
@@ -20959,7 +20761,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
+@@ -471,7 +480,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20968,7 +20770,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
+@@ -479,7 +488,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -20983,7 +20785,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
+@@ -500,7 +515,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -20992,23 +20794,82 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/src/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/src/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/impl/libs/libtext2path/src/Makefile.in 2005-03-05 02:51:51.000000000 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -80,18 +80,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 = $(libtext2path_la_SOURCES)
+ DIST_SOURCES = $(libtext2path_la_SOURCES)
+@@ -246,6 +246,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@
+@@ -439,7 +442,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*) \
+@@ -477,9 +480,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/libs/xrgbrender/Makefile.in kdegraphics-3.4.0/ksvg/impl/libs/xrgbrender/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/libs/xrgbrender/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/libs/xrgbrender/Makefile.in 2005-03-03 04:16:33.625831169 +0100
+--- kdegraphics-3.4.0.orig/ksvg/impl/libs/xrgbrender/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/impl/libs/xrgbrender/Makefile.in 2005-03-05 02:51:51.000000000 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21062,23 +20923,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -716,7 +719,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/impl/Makefile.in kdegraphics-3.4.0/ksvg/impl/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/impl/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/impl/Makefile.in 2005-03-03 04:16:33.575839798 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/Makefile.in kdegraphics-3.4.0/ksvg/plugin/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/plugin/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/plugin/Makefile.in 2005-03-05 02:51:51.501747850 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21087,7 +20938,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.
-@@ -220,18 +220,18 @@
+@@ -87,18 +87,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21108,9 +20959,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 = $(libksvgdomimpl_la_SOURCES)
- DIST_SOURCES = $(libksvgdomimpl_la_SOURCES)
-@@ -398,6 +398,9 @@
+ SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
+ DIST_SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
+@@ -271,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21120,16 +20971,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -697,7 +700,7 @@
+@@ -475,7 +478,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*) \
-@@ -735,9 +738,9 @@
+@@ -513,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21139,9 +20990,9 @@
-$(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:
-@@ -974,7 +977,13 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -672,7 +675,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):
@@ -21156,7 +21007,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -986,7 +995,7 @@
+@@ -684,7 +693,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21165,7 +21016,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -994,7 +1003,13 @@
+@@ -692,7 +701,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -21180,7 +21031,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1015,7 +1030,7 @@
+@@ -713,7 +728,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21189,52 +21040,56 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1242,18 +1257,18 @@
- mocs: SVGScriptElementImpl.moc
+@@ -977,18 +992,18 @@
+ mocs: svgcreator.moc
#>+ 3
--SVGImageElementImpl.moc: $(srcdir)/SVGImageElementImpl.h
-- $(MOC) $(srcdir)/SVGImageElementImpl.h -o SVGImageElementImpl.moc
-+SVGDocumentImpl.moc: $(srcdir)/SVGDocumentImpl.h
-+ $(MOC) $(srcdir)/SVGDocumentImpl.h -o SVGDocumentImpl.moc
+-ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
+- $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
++ksvg_factory.moc: $(srcdir)/ksvg_factory.h
++ $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
#>+ 2
--mocs: SVGImageElementImpl.moc
-+mocs: SVGDocumentImpl.moc
+-mocs: ksvg_plugin.moc
++mocs: ksvg_factory.moc
#>+ 3
--SVGDocumentImpl.moc: $(srcdir)/SVGDocumentImpl.h
-- $(MOC) $(srcdir)/SVGDocumentImpl.h -o SVGDocumentImpl.moc
-+SVGImageElementImpl.moc: $(srcdir)/SVGImageElementImpl.h
-+ $(MOC) $(srcdir)/SVGImageElementImpl.h -o SVGImageElementImpl.moc
+-ksvg_factory.moc: $(srcdir)/ksvg_factory.h
+- $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
++ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
++ $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
#>+ 2
--mocs: SVGDocumentImpl.moc
-+mocs: SVGImageElementImpl.moc
+-mocs: ksvg_factory.moc
++mocs: ksvg_plugin.moc
- #>+ 3
- SVGTimeScheduler.moc: $(srcdir)/SVGTimeScheduler.h
-@@ -1264,10 +1279,10 @@
+ #>+ 8
+ svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
+@@ -1001,7 +1016,7 @@
#>+ 3
clean-metasources:
-- -rm -f SVGScriptElementImpl.moc SVGImageElementImpl.moc SVGDocumentImpl.moc SVGTimeScheduler.moc
-+ -rm -f SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
+- -rm -f ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
++ -rm -f ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
#>+ 2
--KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedPathDataImpl.h SVGAnimatedEnumerationImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGZoomEventImpl.h SVGVKernElementImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGScriptElementImpl.h SVGDocumentImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGLangSpaceImpl.h SVGFEBlendElementImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
-+KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h
+ KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
+@@ -1052,7 +1067,7 @@
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/Makefile.in kdegraphics-3.4.0/ksvg/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/Makefile.in 2005-03-03 04:16:32.494026528 +0100
+
+ #>+ 11
+-libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
++libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
+ @echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
+ rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/plugin/backends/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/plugin/backends/Makefile.in 2005-03-05 02:51:51.509746478 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21243,30 +21098,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 @@
- #>+ 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 = $(libksvg_la_SOURCES)
- DIST_SOURCES = $(libksvg_la_SOURCES)
-@@ -258,6 +258,9 @@
+@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21276,16 +21108,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -398,7 +401,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -436,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21295,9 +21127,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-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -577,7 +580,13 @@
+
+ mostlyclean-libtool:
+@@ -458,7 +461,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):
@@ -21312,7 +21144,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -589,7 +598,7 @@
+@@ -470,7 +479,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21321,7 +21153,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -597,7 +606,13 @@
+@@ -478,7 +487,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -21336,7 +21168,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -618,7 +633,7 @@
+@@ -499,7 +514,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -21346,13 +21178,12 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/agg/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/agg/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/backends/agg/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/backends/agg/Makefile.in 2005-03-03 04:16:33.698818570 +0100
+--- kdegraphics-3.4.0.orig/ksvg/plugin/backends/agg/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/plugin/backends/agg/Makefile.in 2005-03-05 02:51:51.523744078 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21416,13 +21247,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/libart/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/libart/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/backends/libart/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/backends/libart/Makefile.in 2005-03-03 04:16:33.718815119 +0100
+--- kdegraphics-3.4.0.orig/ksvg/plugin/backends/libart/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/plugin/backends/libart/Makefile.in 2005-03-05 02:51:51.536741850 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21485,14 +21315,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/backends/Makefile.in kdegraphics-3.4.0/ksvg/plugin/backends/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/backends/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/backends/Makefile.in 2005-03-03 04:16:33.676822367 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/test/Makefile.in kdegraphics-3.4.0/ksvg/test/Makefile.in
+--- kdegraphics-3.4.0.orig/ksvg/test/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/test/Makefile.in 2005-03-05 02:51:51.544740478 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21580,184 +21409,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/plugin/Makefile.in kdegraphics-3.4.0/ksvg/plugin/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/plugin/Makefile.in 2005-02-25 18:20:31.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/plugin/Makefile.in 2005-03-03 04:16:33.667823920 +0100
-@@ -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.2 $
- # @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.
-@@ -87,18 +87,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 = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
- DIST_SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_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@
-@@ -475,7 +478,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*) \
-@@ -513,9 +516,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)
-@@ -672,7 +675,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 \
-@@ -684,7 +693,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; \
-@@ -692,7 +701,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)' ;; \
-@@ -713,7 +728,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 \
-@@ -977,18 +992,18 @@
- mocs: svgcreator.moc
-
- #>+ 3
--ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-- $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
-+ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-+ $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
-
- #>+ 2
--mocs: ksvg_plugin.moc
-+mocs: ksvg_factory.moc
-
- #>+ 3
--ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-- $(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
-+ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-+ $(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
-
- #>+ 2
--mocs: ksvg_factory.moc
-+mocs: ksvg_plugin.moc
-
- #>+ 8
- svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
-@@ -1001,7 +1016,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
-+ -rm -f ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
-
- #>+ 2
- KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop
-@@ -1052,7 +1067,7 @@
-
-
- #>+ 11
--libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
-+libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
- @echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
- rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/test/external/Makefile.in kdegraphics-3.4.0/ksvg/test/external/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/test/external/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/test/external/Makefile.in 2005-03-03 04:16:33.752809251 +0100
+--- kdegraphics-3.4.0.orig/ksvg/test/external/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/ksvg/test/external/Makefile.in 2005-03-05 02:51:51.557738249 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21820,118 +21478,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/ksvg/test/Makefile.in kdegraphics-3.4.0/ksvg/test/Makefile.in
---- kdegraphics-3.4.0.orig/ksvg/test/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/ksvg/test/Makefile.in 2005-03-03 04:16:33.727813566 +0100
-@@ -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.2 $
- # @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.
-@@ -212,6 +212,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@
-@@ -398,7 +401,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*) \
-@@ -436,9 +439,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:
-@@ -458,7 +461,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 \
-@@ -470,7 +479,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; \
-@@ -478,7 +487,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)' ;; \
-@@ -499,7 +514,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 \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/Makefile.in kdegraphics-3.4.0/kuickshow/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/Makefile.in 2005-03-03 04:16:33.761807698 +0100
+--- kdegraphics-3.4.0.orig/kuickshow/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kuickshow/Makefile.in 2005-03-05 02:51:51.565736878 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22019,23 +21572,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -754,7 +769,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/misc/Makefile.in kdegraphics-3.4.0/kuickshow/misc/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/misc/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/misc/Makefile.in 2005-03-03 04:16:33.769806317 +0100
+--- kdegraphics-3.4.0.orig/kuickshow/misc/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kuickshow/misc/Makefile.in 2005-03-05 02:51:51.572735678 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22075,23 +21618,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/pics/Makefile.in kdegraphics-3.4.0/kuickshow/pics/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/pics/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/pics/Makefile.in 2005-03-03 04:16:33.776805109 +0100
+--- kdegraphics-3.4.0.orig/kuickshow/pics/Makefile.in 2005-03-04 13:27:34.000000000 +0100
++++ kdegraphics-3.4.0/kuickshow/pics/Makefile.in 2005-03-05 02:51:51.579734478 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22131,23 +21664,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,7 +635,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kuickshow/src/Makefile.in kdegraphics-3.4.0/kuickshow/src/Makefile.in
---- kdegraphics-3.4.0.orig/kuickshow/src/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kuickshow/src/Makefile.in 2005-03-03 04:16:33.862790267 +0100
+--- kdegraphics-3.4.0.orig/kuickshow/src/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kuickshow/src/Makefile.in 2005-03-05 02:51:51.651722134 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22311,14 +21834,13 @@
@echo 'creating kuickshow_la.all_cpp.cpp ...'; \
rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/config/Makefile.in kdegraphics-3.4.0/kview/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/config/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/config/Makefile.in 2005-03-03 04:16:33.911781811 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/Makefile.in kdegraphics-3.4.0/kview/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/Makefile.in 2005-03-05 02:51:51.675718019 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22327,7 +21849,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 @@
+@@ -92,18 +92,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22348,9 +21870,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 = $(kcm_kviewgeneralconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
-@@ -261,6 +261,9 @@
+ SOURCES = $(kview_la_SOURCES)
+ #>- DIST_SOURCES = $(kview_la_SOURCES)
+@@ -276,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22360,7 +21882,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -479,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22369,7 +21891,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -517,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22379,9 +21901,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_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -614,7 +617,13 @@
+@@ -687,7 +690,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):
@@ -22396,7 +21918,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -626,7 +635,7 @@
+@@ -699,7 +708,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22405,7 +21927,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -634,7 +643,13 @@
+@@ -707,7 +716,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -22420,7 +21942,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -655,7 +670,7 @@
+@@ -728,7 +743,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22429,14 +21951,37 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/config/plugins/Makefile.in kdegraphics-3.4.0/kview/config/plugins/Makefile.in
---- kdegraphics-3.4.0.orig/kview/config/plugins/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/config/plugins/Makefile.in 2005-03-03 04:16:33.924779568 +0100
+@@ -1014,17 +1029,17 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+
+ #>+ 15
+ force-reedit:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/config/Makefile.in kdegraphics-3.4.0/kview/config/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/config/Makefile.in 2005-03-05 02:51:51.689715619 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22445,7 +21990,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 @@
+@@ -79,18 +79,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22466,9 +22011,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 = $(kcm_kviewpluginsconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
-@@ -245,6 +245,9 @@
+ SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
+ DIST_SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22478,7 +22023,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22487,7 +22032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22499,14 +22044,61 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kimageviewer/Makefile.in kdegraphics-3.4.0/kview/kimageviewer/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kimageviewer/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kimageviewer/Makefile.in 2005-03-03 04:16:33.950775081 +0100
+@@ -614,7 +617,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 \
+@@ -626,7 +635,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; \
+@@ -634,7 +643,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)' ;; \
+@@ -655,7 +670,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/config/plugins/Makefile.in kdegraphics-3.4.0/kview/config/plugins/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/config/plugins/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/config/plugins/Makefile.in 2005-03-05 02:51:51.706712705 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22515,7 +22107,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 @@
+@@ -78,18 +78,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22536,9 +22128,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 = $(libkimageviewer_la_SOURCES)
- DIST_SOURCES = $(libkimageviewer_la_SOURCES)
-@@ -249,6 +249,9 @@
+ SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
+ DIST_SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22548,7 +22140,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22557,7 +22149,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22567,16 +22159,15 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/config/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewcanvas/config/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewcanvas/config/Makefile.in 2005-03-03 04:16:34.020763000 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kimageviewer/Makefile.in kdegraphics-3.4.0/kview/kimageviewer/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/kimageviewer/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kimageviewer/Makefile.in 2005-03-05 02:51:51.720710304 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22585,7 +22176,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.
-@@ -81,18 +81,18 @@
+@@ -82,18 +82,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22606,9 +22197,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 = $(kcm_kviewcanvasconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
-@@ -248,6 +248,9 @@
+ SOURCES = $(libkimageviewer_la_SOURCES)
+ DIST_SOURCES = $(libkimageviewer_la_SOURCES)
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22618,7 +22209,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -448,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22627,7 +22218,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -486,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22637,16 +22228,15 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewcanvas/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewcanvas/Makefile.in 2005-03-03 04:16:33.997766969 +0100
+--- kdegraphics-3.4.0.orig/kview/kviewcanvas/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kviewcanvas/Makefile.in 2005-03-05 02:51:51.745706018 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22757,14 +22347,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/test/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/test/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewcanvas/test/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewcanvas/test/Makefile.in 2005-03-03 04:16:34.032760929 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/config/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/config/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/kviewcanvas/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kviewcanvas/config/Makefile.in 2005-03-05 02:51:51.759703618 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22773,7 +22362,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.
-@@ -68,18 +68,18 @@
+@@ -81,18 +81,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22794,9 +22383,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 = $(test_SOURCES)
- DIST_SOURCES = $(test_SOURCES)
-@@ -232,6 +232,9 @@
+ SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
+ DIST_SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22806,7 +22395,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
+@@ -445,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22815,7 +22404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -483,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22825,16 +22414,15 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/config/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewviewer/config/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewviewer/config/Makefile.in 2005-03-03 04:16:34.084751955 +0100
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewcanvas/test/Makefile.in kdegraphics-3.4.0/kview/kviewcanvas/test/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/kviewcanvas/test/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kviewcanvas/test/Makefile.in 2005-03-05 02:51:51.770701732 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22843,7 +22431,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 @@
+@@ -68,18 +68,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -22864,9 +22452,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 = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
-@@ -246,6 +246,9 @@
+ SOURCES = $(test_SOURCES)
+ DIST_SOURCES = $(test_SOURCES)
+@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22876,7 +22464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22885,7 +22473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22895,16 +22483,15 @@
-$(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)
+
+ clean-checkPROGRAMS:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewviewer/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewviewer/Makefile.in 2005-03-03 04:16:34.070754371 +0100
+--- kdegraphics-3.4.0.orig/kview/kviewviewer/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kviewviewer/Makefile.in 2005-03-05 02:51:51.800696589 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23015,14 +22602,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/test/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/test/Makefile.in
---- kdegraphics-3.4.0.orig/kview/kviewviewer/test/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/kviewviewer/test/Makefile.in 2005-03-03 04:16:34.095750057 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/config/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/config/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/kviewviewer/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kviewviewer/config/Makefile.in 2005-03-05 02:51:51.813694360 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23031,7 +22617,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.
-@@ -67,18 +67,18 @@
+@@ -79,18 +79,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -23052,9 +22638,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 = $(test_SOURCES)
- DIST_SOURCES = $(test_SOURCES)
-@@ -231,6 +231,9 @@
+ SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
+ DIST_SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23064,7 +22650,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -441,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23073,7 +22659,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -479,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23083,16 +22669,15 @@
-$(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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/Makefile.in kdegraphics-3.4.0/kview/Makefile.in
---- kdegraphics-3.4.0.orig/kview/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/Makefile.in 2005-03-03 04:16:33.897784227 +0100
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/kviewviewer/test/Makefile.in kdegraphics-3.4.0/kview/kviewviewer/test/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/kviewviewer/test/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/kviewviewer/test/Makefile.in 2005-03-05 02:51:51.824692475 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23101,7 +22686,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.
-@@ -92,18 +92,18 @@
+@@ -67,18 +67,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -23122,9 +22707,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 = $(kview_la_SOURCES)
- #>- DIST_SOURCES = $(kview_la_SOURCES)
-@@ -276,6 +276,9 @@
+ SOURCES = $(test_SOURCES)
+ DIST_SOURCES = $(test_SOURCES)
+@@ -231,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23134,7 +22719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -422,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23143,7 +22728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23153,9 +22738,55 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -687,7 +690,13 @@
+
+ clean-checkPROGRAMS:
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/Makefile.in kdegraphics-3.4.0/kview/modules/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/modules/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/Makefile.in 2005-03-05 02:51:51.832691103 +0100
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @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.
+@@ -212,6 +212,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@
+@@ -398,7 +401,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*) \
+@@ -436,9 +439,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:
+@@ -458,7 +461,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):
@@ -23170,7 +22801,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -699,7 +708,7 @@
+@@ -470,7 +479,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23179,7 +22810,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -707,7 +716,13 @@
+@@ -478,7 +487,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -23194,7 +22825,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -728,7 +743,7 @@
+@@ -499,7 +514,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23203,38 +22834,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1014,17 +1029,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
-
- #>+ 15
- force-reedit:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/browser/Makefile.in kdegraphics-3.4.0/kview/modules/browser/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/browser/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/browser/Makefile.in 2005-03-03 04:16:34.117746260 +0100
+--- kdegraphics-3.4.0.orig/kview/modules/browser/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/browser/Makefile.in 2005-03-05 02:51:51.847688531 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23298,13 +22904,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/effects/Makefile.in kdegraphics-3.4.0/kview/modules/effects/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/effects/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/effects/Makefile.in 2005-03-03 04:16:34.131743844 +0100
+--- kdegraphics-3.4.0.orig/kview/modules/effects/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/effects/Makefile.in 2005-03-05 02:51:51.861686131 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23367,14 +22972,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/Makefile.in kdegraphics-3.4.0/kview/modules/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/Makefile.in 2005-03-03 04:16:34.103748676 +0100
+diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/presenter/Makefile.in kdegraphics-3.4.0/kview/modules/presenter/Makefile.in
+--- kdegraphics-3.4.0.orig/kview/modules/presenter/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/presenter/Makefile.in 2005-03-05 02:51:51.878683217 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23383,7 +22987,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.
-@@ -212,6 +212,9 @@
+@@ -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 = $(kview_presenterplugin_la_SOURCES)
+ DIST_SOURCES = $(kview_presenterplugin_la_SOURCES)
+@@ -261,6 +261,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23393,16 +23020,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am all-recursive
+@@ -458,7 +461,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*) \
-@@ -436,9 +439,9 @@
+@@ -496,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23412,9 +23039,9 @@
-$(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:
-@@ -458,7 +461,13 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -597,7 +600,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):
@@ -23429,7 +23056,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -470,7 +479,7 @@
+@@ -609,7 +618,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23438,7 +23065,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -478,7 +487,13 @@
+@@ -617,7 +626,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -23453,7 +23080,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -499,7 +514,7 @@
+@@ -638,7 +653,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23462,23 +23089,13 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -746,7 +761,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/presenter/config/Makefile.in kdegraphics-3.4.0/kview/modules/presenter/config/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/presenter/config/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/presenter/config/Makefile.in 2005-03-03 04:16:34.169737286 +0100
+--- kdegraphics-3.4.0.orig/kview/modules/presenter/config/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/presenter/config/Makefile.in 2005-03-05 02:51:51.891680988 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23541,132 +23158,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/presenter/Makefile.in kdegraphics-3.4.0/kview/modules/presenter/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/presenter/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/presenter/Makefile.in 2005-03-03 04:16:34.156739529 +0100
-@@ -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.2 $
- # @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 = $(kview_presenterplugin_la_SOURCES)
- DIST_SOURCES = $(kview_presenterplugin_la_SOURCES)
-@@ -261,6 +261,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,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*) \
-@@ -496,9 +499,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)
-@@ -597,7 +600,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 \
-@@ -609,7 +618,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; \
-@@ -617,7 +626,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)' ;; \
-@@ -638,7 +653,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 -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/scale/Makefile.in kdegraphics-3.4.0/kview/modules/scale/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/scale/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/scale/Makefile.in 2005-03-03 04:16:34.195732799 +0100
+--- kdegraphics-3.4.0.orig/kview/modules/scale/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/scale/Makefile.in 2005-03-05 02:51:51.922675673 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23730,13 +23228,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/scanner/Makefile.in kdegraphics-3.4.0/kview/modules/scanner/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/scanner/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/scanner/Makefile.in 2005-03-03 04:16:34.208730555 +0100
+--- kdegraphics-3.4.0.orig/kview/modules/scanner/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/scanner/Makefile.in 2005-03-05 02:51:51.945671730 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23800,13 +23297,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/modules/template/Makefile.in kdegraphics-3.4.0/kview/modules/template/Makefile.in
---- kdegraphics-3.4.0.orig/kview/modules/template/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/modules/template/Makefile.in 2005-03-03 04:16:34.220728484 +0100
+--- kdegraphics-3.4.0.orig/kview/modules/template/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/modules/template/Makefile.in 2005-03-05 02:51:51.958669502 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23870,13 +23366,12 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kview/photobook/Makefile.in kdegraphics-3.4.0/kview/photobook/Makefile.in
---- kdegraphics-3.4.0.orig/kview/photobook/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kview/photobook/Makefile.in 2005-03-03 04:16:34.238725378 +0100
+--- kdegraphics-3.4.0.orig/kview/photobook/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kview/photobook/Makefile.in 2005-03-05 02:51:51.972667101 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23958,13 +23453,12 @@
#>+ 15
force-reedit:
diff -u -Nru -x debian kdegraphics-3.4.0.orig/kviewshell/Makefile.in kdegraphics-3.4.0/kviewshell/Makefile.in
---- kdegraphics-3.4.0.orig/kviewshell/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/kviewshell/Makefile.in 2005-03-03 04:16:34.310712952 +0100
+--- kdegraphics-3.4.0.orig/kviewshell/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/kviewshell/Makefile.in 2005-03-05 02:51:52.030657158 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24135,13 +23629,12 @@
$(srcdir)/selection.cpp: kvsprefs.h
history.lo: history.moc
diff -u -Nru -x debian kdegraphics-3.4.0.orig/libkscan/Makefile.in kdegraphics-3.4.0/libkscan/Makefile.in
---- kdegraphics-3.4.0.orig/libkscan/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/libkscan/Makefile.in 2005-03-03 04:16:34.426692933 +0100
+--- kdegraphics-3.4.0.orig/libkscan/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/libkscan/Makefile.in 2005-03-05 02:51:52.145637442 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24296,13 +23789,12 @@
rm -f libkscan_la.all_cpp.files libkscan_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkscan_la.all_cpp.final; \
diff -u -Nru -x debian kdegraphics-3.4.0.orig/libkscan/pics/Makefile.in kdegraphics-3.4.0/libkscan/pics/Makefile.in
---- kdegraphics-3.4.0.orig/libkscan/pics/Makefile.in 2005-02-25 18:20:32.000000000 +0100
-+++ kdegraphics-3.4.0/libkscan/pics/Makefile.in 2005-03-03 04:16:34.435691380 +0100
+--- kdegraphics-3.4.0.orig/libkscan/pics/Makefile.in 2005-03-04 13:27:35.000000000 +0100
++++ kdegraphics-3.4.0/libkscan/pics/Makefile.in 2005-03-05 02:51:52.154635899 +0100
@@ -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.2 $
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24363,137 +23855,3 @@
#>+ 15
force-reedit:
-@@ -612,7 +615,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 -u -Nru -x debian kdegraphics-3.4.0.orig/Makefile.in kdegraphics-3.4.0/Makefile.in
---- kdegraphics-3.4.0.orig/Makefile.in 2005-02-25 18:20:28.000000000 +0100
-+++ kdegraphics-3.4.0/Makefile.in 2005-03-03 04:16:23.947501741 +0100
-@@ -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.2 $
- # @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.
-@@ -229,6 +229,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@
-@@ -427,7 +430,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -469,12 +472,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
-@@ -486,7 +489,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 $@
-@@ -511,7 +514,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 \
-@@ -523,7 +532,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; \
-@@ -531,7 +540,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)' ;; \
-@@ -552,7 +567,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 \
-@@ -897,7 +912,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in rules configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
-@@ -922,7 +937,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; \