bl3ify and update to kde3.2.2.

Changes:
* kiconedit: Fix [PATCH] Adds large current color viewer to palette toolbar
* kiconedit: Fix Visual difference between a gray and transparent pixel
* kpdf: Fix KPDF can't open files whose names have non-ASCII letters
* ksvg: Fix Transformed symbols sometimes disappear
* configure: Fix Extraneous message in admin/Makefile.common using --prefix
* kghostview: Fix the executable linking against the part, by adding a
  common library.

5 files changed, 18 insertions, 730 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 303eeb589dc..876d6e77baa 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2004/04/14 16:15:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2004/04/20 13:52:06 markd Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
@@ -10,7 +9,7 @@ COMMENT=	Graphics programs for the KDE integrated X11 desktop
 #DEPENDS+=	gPhoto2
 #DEPENDS+=	gpio
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 
 BUILDLINK_DEPENDS.lcms=	lcms>=1.12
@@ -29,12 +28,13 @@ PLIST_SUBST+=		KGAMMA_SUFFIX="a"
 PLIST_SUBST+=		KGAMMA_SUFFIX="so"
 .endif
 
-.include "../../converters/fribidi/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../graphics/sane-backends/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/sane-backends/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST
index 82ba6ecaa3d..f78dabdf64b 100644
--- a/graphics/kdegraphics3/PLIST
+++ b/graphics/kdegraphics3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/03/14 00:44:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/04/20 13:52:06 markd Exp $
 bin/kcolorchooser
 bin/kcoloredit
 bin/kdvi
@@ -279,6 +279,10 @@ lib/libkdeinit_kview.la
 lib/libkdeinit_kview.so
 lib/libkdeinit_mrmlsearch.la
 lib/libkdeinit_mrmlsearch.so
+lib/libkghostviewlib.la
+lib/libkghostviewlib.so
+lib/libkghostviewlib.so.0
+lib/libkghostviewlib.so.0.0
 lib/libkimageviewer.la
 lib/libkimageviewer.so
 lib/libkimageviewer.so.0
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 97aff117ffc..b1ea5470734 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.17 2004/03/14 00:44:27 markd Exp $
+$NetBSD: distinfo,v 1.18 2004/04/20 13:52:06 markd Exp $
 
-SHA1 (kdegraphics-3.2.1.tar.bz2) = 472c635fb925dc693d6b1eaeb97ab623970db7d7
-Size (kdegraphics-3.2.1.tar.bz2) = 5726582 bytes
-SHA1 (patch-aa) = c6ca9c235700faeb7f3067eeb4aee49f71a7fd0d
-SHA1 (patch-ab) = 6ec9cb1e32c1b35bb6093ee0e9e2b073689ad05d
+SHA1 (kdegraphics-3.2.2.tar.bz2) = a759aa4912679d3f6e5c32675614dc5d0b08fc2d
+Size (kdegraphics-3.2.2.tar.bz2) = 5669199 bytes
diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa
deleted file mode 100644
index d68a19c0b1b..00000000000
--- a/graphics/kdegraphics3/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/03/14 00:44:27 markd Exp $
-
---- kghostview/Makefile.am	2004-02-29 21:43:17.000000000 +1300
-+++ kghostview/Makefile.am	2003-09-03 02:02:44.000000000 +1200
-@@ -5,18 +5,15 @@
- ####### Files
- 
- bin_PROGRAMS = 	kghostview
--lib_LTLIBRARIES = libkghostviewlib.la
- kde_module_LTLIBRARIES = libkghostviewpart.la
- noinst_LTLIBRARIES = libdscparse.la
- 
--libkghostviewlib_la_LDFLAGS = $(all_libraries)
--libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la
--
- libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
--libkghostviewpart_la_LIBADD = libkghostviewlib.la
-+libkghostviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint \
-+	libdscparse.la
- 
- # Check "make final" after making changes to the following line!!
--libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
-+libkghostviewpart_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
- 	marklist.cpp logwindow.cpp infodialog.cpp \
- 	kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
- 	kgvconfigdialog.cpp kgvmainwidget.cpp \
-@@ -24,14 +21,9 @@
- 	fullscreenfilter.cpp kgvfactory.cpp \
-     generalsettingswidget.ui gssettingswidget.ui thumbnailservice.cpp
- 
--libkghostviewpart_la_SOURCES = part_dummy.cpp
--
--part_dummy.cpp:
--	touch part_dummy.cpp
--
- kghostview_SOURCES = main.cpp
- kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kghostview_LDADD = libkghostviewlib.la
-+kghostview_LDADD = libkghostviewpart.la
- 
- libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
- libdscparse_la_LIBADD = $(LIB_QT)
diff --git a/graphics/kdegraphics3/patches/patch-ab b/graphics/kdegraphics3/patches/patch-ab
deleted file mode 100644
index 83c9e2e4975..00000000000
--- a/graphics/kdegraphics3/patches/patch-ab
+++ /dev/null
@@ -1,672 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/03/14 00:44:27 markd Exp $
-
---- kghostview/Makefile.in	2004-03-01 10:44:41.000000000 +1300
-+++ kghostview/Makefile.in	2004-01-26 08:07:02.000000000 +1300
-@@ -350,18 +350,16 @@
- 
- ####### Files
- bin_PROGRAMS = kghostview
--lib_LTLIBRARIES = libkghostviewlib.la
- kde_module_LTLIBRARIES = libkghostviewpart.la
- noinst_LTLIBRARIES = libdscparse.la
- 
--libkghostviewlib_la_LDFLAGS = $(all_libraries)
--libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la
--
- libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
--libkghostviewpart_la_LIBADD = libkghostviewlib.la
-+libkghostviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint \
-+	libdscparse.la
-+
- 
- # Check "make final" after making changes to the following line!!
--#>- libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
-+#>- libkghostviewpart_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
- #>- 	marklist.cpp logwindow.cpp infodialog.cpp \
- #>- 	kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
- #>- 	kgvconfigdialog.cpp kgvmainwidget.cpp \
-@@ -369,7 +367,7 @@
- #>- 	fullscreenfilter.cpp kgvfactory.cpp \
- #>-     generalsettingswidget.ui gssettingswidget.ui thumbnailservice.cpp
- #>+ 7
--libkghostviewlib_la_SOURCES=kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
-+libkghostviewpart_la_SOURCES=kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
- 	marklist.cpp logwindow.cpp infodialog.cpp \
- 	kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
- 	kgvconfigdialog.cpp kgvmainwidget.cpp \
-@@ -378,11 +376,9 @@
-       thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp
- 
- 
--libkghostviewpart_la_SOURCES = part_dummy.cpp
--
- kghostview_SOURCES = main.cpp
- kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kghostview_LDADD = libkghostviewlib.la
-+kghostview_LDADD = libkghostviewpart.la
- 
- #>- libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
- #>+ 1
-@@ -411,8 +407,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) \
--	$(noinst_LTLIBRARIES)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
- 
- libdscparse_la_DEPENDENCIES =
- am_libdscparse_la_OBJECTS = dscparse.lo dscparse_adapter.lo
-@@ -422,29 +417,24 @@
- libdscparse_la_nofinal_OBJECTS = dscparse.lo dscparse_adapter.lo
- @KDE_USE_FINAL_FALSE@libdscparse_la_OBJECTS = $(libdscparse_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE@libdscparse_la_OBJECTS = $(libdscparse_la_final_OBJECTS)
--libkghostviewlib_la_DEPENDENCIES = libdscparse.la
--am_libkghostviewlib_la_OBJECTS = kgvshell.lo kgvdocument.lo \
-+libkghostviewpart_la_DEPENDENCIES = libdscparse.la
-+am_libkghostviewpart_la_OBJECTS = kgvshell.lo kgvdocument.lo \
- 	kgv_miniwidget.lo marklist.lo logwindow.lo infodialog.lo \
- 	kgvpageview.lo ps.lo kgv_view.lo scrollbox.lo \
- 	kgvpagedecorator.lo kgvconfigdialog.lo kgvmainwidget.lo \
- 	kdscerrordialog.lo displayoptions.lo kpswidget.lo \
- 	fullscreenfilter.lo kgvfactory.lo thumbnailservice.lo
--#>- libkghostviewlib_la_OBJECTS = $(am_libkghostviewlib_la_OBJECTS)
-+#>- libkghostviewpart_la_OBJECTS = $(am_libkghostviewpart_la_OBJECTS)
- #>+ 9
--libkghostviewlib_la_final_OBJECTS = libkghostviewlib_la.all_cpp.lo ps.lo 
--libkghostviewlib_la_nofinal_OBJECTS = kgvshell.lo kgvdocument.lo \
-+libkghostviewpart_la_final_OBJECTS = ps.lo libkghostviewpart_la.all_cpp.lo 
-+libkghostviewpart_la_nofinal_OBJECTS = kgvshell.lo kgvdocument.lo \
- 	kgv_miniwidget.lo marklist.lo logwindow.lo infodialog.lo \
- 	kgvpageview.lo ps.lo kgv_view.lo scrollbox.lo \
- 	kgvpagedecorator.lo kgvconfigdialog.lo kgvmainwidget.lo \
- 	kdscerrordialog.lo displayoptions.lo kpswidget.lo \
- 	fullscreenfilter.lo kgvfactory.lo thumbnailservice.lo generalsettingswidget.lo gssettingswidget.lo
--@KDE_USE_FINAL_FALSE@libkghostviewlib_la_OBJECTS = $(libkghostviewlib_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@libkghostviewlib_la_OBJECTS = $(libkghostviewlib_la_final_OBJECTS)
--libkghostviewpart_la_DEPENDENCIES = libkghostviewlib.la
--am_libkghostviewpart_la_OBJECTS = part_dummy.lo
--#>- libkghostviewpart_la_OBJECTS = $(am_libkghostviewpart_la_OBJECTS)
--#>+ 1
--libkghostviewpart_la_OBJECTS = part_dummy.lo
-+@KDE_USE_FINAL_FALSE@libkghostviewpart_la_OBJECTS = $(libkghostviewpart_la_nofinal_OBJECTS)
-+@KDE_USE_FINAL_TRUE@libkghostviewpart_la_OBJECTS = $(libkghostviewpart_la_final_OBJECTS)
- bin_PROGRAMS = kghostview$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
-@@ -452,7 +442,7 @@
- #>- kghostview_OBJECTS = $(am_kghostview_OBJECTS)
- #>+ 1
- kghostview_OBJECTS = main.$(OBJEXT)
--kghostview_DEPENDENCIES = libkghostviewlib.la
-+kghostview_DEPENDENCIES = libkghostviewpart.la
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@@ -473,11 +463,11 @@
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kgvpageview.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kgvshell.Plo ./$(DEPDIR)/kpswidget.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/logwindow.Plo ./$(DEPDIR)/main.Po \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/part_dummy.Plo \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/ps.Plo ./$(DEPDIR)/scrollbox.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/ps.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/scrollbox.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/thumbnailservice.Plo
- #>+ 38
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/generalsettingswidget.P $(DEPDIR)/gssettingswidget.P  $(DEPDIR)/libdscparse_la.all_cpp.P $(DEPDIR)/libkghostviewlib_la.all_cpp.P ./$(DEPDIR)/displayoptions.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/generalsettingswidget.P $(DEPDIR)/gssettingswidget.P  $(DEPDIR)/libdscparse_la.all_cpp.P $(DEPDIR)/libkghostviewpart_la.all_cpp.P ./$(DEPDIR)/displayoptions.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dscparse.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dscparse_adapter.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/fullscreenfilter.Plo \
-@@ -493,8 +483,8 @@
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kgvpageview.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kgvshell.Plo ./$(DEPDIR)/kpswidget.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/logwindow.Plo ./$(DEPDIR)/main.Po \
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/part_dummy.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ps.Plo ./$(DEPDIR)/scrollbox.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/ps.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/scrollbox.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/thumbnailservice.Plo
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/generalsettingswidget.P $(DEPDIR)/gssettingswidget.P ./$(DEPDIR)/displayoptions.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dscparse.Plo \
-@@ -512,8 +502,8 @@
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kgvpageview.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kgvshell.Plo ./$(DEPDIR)/kpswidget.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/logwindow.Plo ./$(DEPDIR)/main.Po \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/part_dummy.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ps.Plo ./$(DEPDIR)/scrollbox.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/ps.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/scrollbox.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/thumbnailservice.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -540,8 +530,8 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) \
--	$(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES)
-+DIST_SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewpart_la_SOURCES) \
-+	$(kghostview_SOURCES)
- DATA = $(part_DATA) $(xdg_apps_DATA)
- 
- HEADERS = $(noinst_HEADERS)
-@@ -561,7 +551,7 @@
- DIST_COMMON = README $(noinst_HEADERS) AUTHORS ChangeLog Makefile.am \
- 	Makefile.in TODO
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES)
-+SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES)
- 
- #>- all: all-recursive
- #>+ 1
-@@ -606,34 +596,6 @@
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
--libLTLIBRARIES_INSTALL = $(INSTALL)
--install-libLTLIBRARIES: $(lib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    f="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
--	  else :; fi; \
--	done
--
--uninstall-libLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	    p="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
--	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
--	done
--
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
--	  test "$$dir" = "$$p" && dir=.; \
--	  echo "rm -f \"$${dir}/so_locations\""; \
--	  rm -f "$${dir}/so_locations"; \
--	done
- 
- clean-noinstLTLIBRARIES:
- 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -648,8 +610,6 @@
- @KDE_USE_CLOSURE_TRUE@libdscparse.la: libdscparse.la.closure $(libdscparse_la_OBJECTS) $(libdscparse_la_DEPENDENCIES) 
- @KDE_USE_CLOSURE_FALSE@libdscparse.la: $(libdscparse_la_OBJECTS) $(libdscparse_la_DEPENDENCIES) 
- 	$(CXXLINK)  $(libdscparse_la_LDFLAGS) $(libdscparse_la_OBJECTS) $(libdscparse_la_LIBADD) $(LIBS)
--libkghostviewlib.la: $(libkghostviewlib_la_OBJECTS) $(libkghostviewlib_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkghostviewlib_la_LDFLAGS) $(libkghostviewlib_la_OBJECTS) $(libkghostviewlib_la_LIBADD) $(LIBS)
- #>- libkghostviewpart.la: $(libkghostviewpart_la_OBJECTS) $(libkghostviewpart_la_DEPENDENCIES) 
- #>+ 2
- @KDE_USE_CLOSURE_TRUE@libkghostviewpart.la: libkghostviewpart.la.closure $(libkghostviewpart_la_OBJECTS) $(libkghostviewpart_la_DEPENDENCIES) 
-@@ -713,7 +673,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logwindow.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/marklist.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/part_dummy.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ps.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollbox.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnailservice.Plo@am__quote@
-@@ -1006,11 +965,9 @@
- check-am: all-am
- check: check-recursive
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
--install-binPROGRAMS: install-libLTLIBRARIES
--
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(partdir) $(DESTDIR)$(xdg_appsdir)
-+	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(partdir) $(DESTDIR)$(xdg_appsdir)
- 
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -1041,12 +998,10 @@
- clean: kde-rpo-clean  clean-recursive
- 
- #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
--#>- 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
--#>- 	mostlyclean-am
--#>+ 3
-+#>- 	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
-+#>+ 2
- clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
--	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
--	mostlyclean-am
-+	clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
- 
- distclean: distclean-recursive
- 
-@@ -1067,9 +1022,9 @@
- install-data-am: install-kde-icons   install-partDATA \
- 	install-xdg_appsDATA
- 
--#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-+#>- install-exec-am: install-binPROGRAMS
- #>+ 1
--install-exec-am:  install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
-+install-exec-am:  install-binPROGRAMS install-kde_moduleLTLIBRARIES
- 
- install-info: install-info-recursive
- 
-@@ -1095,27 +1050,26 @@
- ps-am:
- 
- #>- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
--#>- 	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
--#>- 	uninstall-partDATA uninstall-xdg_appsDATA
-+#>- 	uninstall-kde_moduleLTLIBRARIES uninstall-partDATA \
-+#>- 	uninstall-xdg_appsDATA
- #>+ 3
- uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-info-am \
--	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
--	uninstall-partDATA uninstall-xdg_appsDATA
-+	uninstall-kde_moduleLTLIBRARIES uninstall-partDATA \
-+	uninstall-xdg_appsDATA
- 
- uninstall-info: uninstall-info-recursive
- 
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- 	clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
--	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
--	clean-recursive ctags ctags-recursive distclean \
--	distclean-compile distclean-depend distclean-generic \
--	distclean-libtool distclean-recursive distclean-tags distdir \
--	dvi dvi-am dvi-recursive info info-am info-recursive install \
--	install-am install-binPROGRAMS install-data install-data-am \
--	install-data-recursive install-exec install-exec-am \
--	install-exec-recursive install-info install-info-am \
--	install-info-recursive install-kde_moduleLTLIBRARIES \
--	install-libLTLIBRARIES install-man install-partDATA \
-+	clean-libtool clean-noinstLTLIBRARIES clean-recursive ctags \
-+	ctags-recursive distclean distclean-compile distclean-depend \
-+	distclean-generic distclean-libtool distclean-recursive \
-+	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-+	info-recursive install install-am install-binPROGRAMS \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive \
-+	install-kde_moduleLTLIBRARIES install-man install-partDATA \
- 	install-recursive install-strip install-xdg_appsDATA \
- 	installcheck installcheck-am installdirs installdirs-am \
- 	installdirs-recursive maintainer-clean maintainer-clean-generic \
-@@ -1124,13 +1078,10 @@
- 	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
- 	tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
- 	uninstall-info-am uninstall-info-recursive \
--	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
--	uninstall-partDATA uninstall-recursive uninstall-xdg_appsDATA
-+	uninstall-kde_moduleLTLIBRARIES uninstall-partDATA \
-+	uninstall-recursive uninstall-xdg_appsDATA
- 
- 
--part_dummy.cpp:
--	touch part_dummy.cpp
--
- messages: rc.cpp
- 	$(XGETTEXT) *.cpp *.h -o $(podir)/kghostview.pot
- 
-@@ -1152,13 +1103,6 @@
- 
- 
- #>+ 3
--thumbnailservice.moc: $(srcdir)/thumbnailservice.h
--	$(MOC) $(srcdir)/thumbnailservice.h -o thumbnailservice.moc
--
--#>+ 2
--mocs: thumbnailservice.moc
--
--#>+ 3
- kgvpageview.moc: $(srcdir)/kgvpageview.h
- 	$(MOC) $(srcdir)/kgvpageview.h -o kgvpageview.moc
- 
-@@ -1166,60 +1110,60 @@
- mocs: kgvpageview.moc
- 
- #>+ 3
--infodialog.moc: $(srcdir)/infodialog.h
--	$(MOC) $(srcdir)/infodialog.h -o infodialog.moc
-+kpswidget.moc: $(srcdir)/kpswidget.h
-+	$(MOC) $(srcdir)/kpswidget.h -o kpswidget.moc
- 
- #>+ 2
--mocs: infodialog.moc
-+mocs: kpswidget.moc
- 
- #>+ 3
--viewcontrol.moc: $(srcdir)/viewcontrol.h
--	$(MOC) $(srcdir)/viewcontrol.h -o viewcontrol.moc
-+thumbnailservice.moc: $(srcdir)/thumbnailservice.h
-+	$(MOC) $(srcdir)/thumbnailservice.h -o thumbnailservice.moc
- 
- #>+ 2
--mocs: viewcontrol.moc
-+mocs: thumbnailservice.moc
- 
- #>+ 3
--kgvdocument.moc: $(srcdir)/kgvdocument.h
--	$(MOC) $(srcdir)/kgvdocument.h -o kgvdocument.moc
-+kgvmainwidget.moc: $(srcdir)/kgvmainwidget.h
-+	$(MOC) $(srcdir)/kgvmainwidget.h -o kgvmainwidget.moc
- 
- #>+ 2
--mocs: kgvdocument.moc
-+mocs: kgvmainwidget.moc
- 
- #>+ 3
--scrollbox.moc: $(srcdir)/scrollbox.h
--	$(MOC) $(srcdir)/scrollbox.h -o scrollbox.moc
-+marklist.moc: $(srcdir)/marklist.h
-+	$(MOC) $(srcdir)/marklist.h -o marklist.moc
- 
- #>+ 2
--mocs: scrollbox.moc
-+mocs: marklist.moc
- 
- #>+ 3
--logwindow.moc: $(srcdir)/logwindow.h
--	$(MOC) $(srcdir)/logwindow.h -o logwindow.moc
-+kgvconfigdialog.moc: $(srcdir)/kgvconfigdialog.h
-+	$(MOC) $(srcdir)/kgvconfigdialog.h -o kgvconfigdialog.moc
- 
- #>+ 2
--mocs: logwindow.moc
-+mocs: kgvconfigdialog.moc
- 
- #>+ 3
--kgv_miniwidget.moc: $(srcdir)/kgv_miniwidget.h
--	$(MOC) $(srcdir)/kgv_miniwidget.h -o kgv_miniwidget.moc
-+kgv_view.moc: $(srcdir)/kgv_view.h
-+	$(MOC) $(srcdir)/kgv_view.h -o kgv_view.moc
- 
- #>+ 2
--mocs: kgv_miniwidget.moc
-+mocs: kgv_view.moc
- 
- #>+ 3
--kgv_view.moc: $(srcdir)/kgv_view.h
--	$(MOC) $(srcdir)/kgv_view.h -o kgv_view.moc
-+kgvdocument.moc: $(srcdir)/kgvdocument.h
-+	$(MOC) $(srcdir)/kgvdocument.h -o kgvdocument.moc
- 
- #>+ 2
--mocs: kgv_view.moc
-+mocs: kgvdocument.moc
- 
- #>+ 3
--kpswidget.moc: $(srcdir)/kpswidget.h
--	$(MOC) $(srcdir)/kpswidget.h -o kpswidget.moc
-+kdscerrordialog.moc: $(srcdir)/kdscerrordialog.h
-+	$(MOC) $(srcdir)/kdscerrordialog.h -o kdscerrordialog.moc
- 
- #>+ 2
--mocs: kpswidget.moc
-+mocs: kdscerrordialog.moc
- 
- #>+ 3
- fullscreenfilter.moc: $(srcdir)/fullscreenfilter.h
-@@ -1229,39 +1173,46 @@
- mocs: fullscreenfilter.moc
- 
- #>+ 3
--kgvshell.moc: $(srcdir)/kgvshell.h
--	$(MOC) $(srcdir)/kgvshell.h -o kgvshell.moc
-+logwindow.moc: $(srcdir)/logwindow.h
-+	$(MOC) $(srcdir)/logwindow.h -o logwindow.moc
- 
- #>+ 2
--mocs: kgvshell.moc
-+mocs: logwindow.moc
- 
- #>+ 3
--marklist.moc: $(srcdir)/marklist.h
--	$(MOC) $(srcdir)/marklist.h -o marklist.moc
-+infodialog.moc: $(srcdir)/infodialog.h
-+	$(MOC) $(srcdir)/infodialog.h -o infodialog.moc
- 
- #>+ 2
--mocs: marklist.moc
-+mocs: infodialog.moc
- 
- #>+ 3
--kgvconfigdialog.moc: $(srcdir)/kgvconfigdialog.h
--	$(MOC) $(srcdir)/kgvconfigdialog.h -o kgvconfigdialog.moc
-+viewcontrol.moc: $(srcdir)/viewcontrol.h
-+	$(MOC) $(srcdir)/viewcontrol.h -o viewcontrol.moc
- 
- #>+ 2
--mocs: kgvconfigdialog.moc
-+mocs: viewcontrol.moc
- 
- #>+ 3
--kdscerrordialog.moc: $(srcdir)/kdscerrordialog.h
--	$(MOC) $(srcdir)/kdscerrordialog.h -o kdscerrordialog.moc
-+kgv_miniwidget.moc: $(srcdir)/kgv_miniwidget.h
-+	$(MOC) $(srcdir)/kgv_miniwidget.h -o kgv_miniwidget.moc
- 
- #>+ 2
--mocs: kdscerrordialog.moc
-+mocs: kgv_miniwidget.moc
- 
- #>+ 3
--kgvmainwidget.moc: $(srcdir)/kgvmainwidget.h
--	$(MOC) $(srcdir)/kgvmainwidget.h -o kgvmainwidget.moc
-+kgvshell.moc: $(srcdir)/kgvshell.h
-+	$(MOC) $(srcdir)/kgvshell.h -o kgvshell.moc
- 
- #>+ 2
--mocs: kgvmainwidget.moc
-+mocs: kgvshell.moc
-+
-+#>+ 3
-+scrollbox.moc: $(srcdir)/scrollbox.h
-+	$(MOC) $(srcdir)/scrollbox.h -o scrollbox.moc
-+
-+#>+ 2
-+mocs: scrollbox.moc
- 
- #>+ 8
- libkghostviewpart.la.closure: $(libkghostviewpart_la_OBJECTS) $(libkghostviewpart_la_DEPENDENCIES)
-@@ -1274,10 +1225,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  thumbnailservice.moc kgvpageview.moc infodialog.moc viewcontrol.moc kgvdocument.moc scrollbox.moc logwindow.moc kgv_miniwidget.moc kgv_view.moc kpswidget.moc fullscreenfilter.moc kgvshell.moc marklist.moc kgvconfigdialog.moc kdscerrordialog.moc kgvmainwidget.moc
-+	-rm -f  kgvpageview.moc kpswidget.moc thumbnailservice.moc kgvmainwidget.moc marklist.moc kgvconfigdialog.moc kgv_view.moc kgvdocument.moc kdscerrordialog.moc fullscreenfilter.moc logwindow.moc infodialog.moc viewcontrol.moc kgv_miniwidget.moc kgvshell.moc scrollbox.moc
- 
- #>+ 2
--KDE_DIST=kgv_part.rc gssettingswidget.ui.h gssettingswidget.ui generalsettingswidget.ui.h viewcontrol.cpp kghostviewui.rc cr64-app-kghostview.png cr16-app-kghostview.png kgv.h cr128-app-kghostview.png version.h cr32-app-kghostview.png generalsettingswidget.ui viewcontrol.h cr48-app-kghostview.png 
-+KDE_DIST=viewcontrol.cpp generalsettingswidget.ui.h cr32-app-kghostview.png cr16-app-kghostview.png cr48-app-kghostview.png kghostviewui.rc kgv.h version.h generalsettingswidget.ui cr64-app-kghostview.png cr128-app-kghostview.png viewcontrol.h kgv_part.rc gssettingswidget.ui.h gssettingswidget.ui 
- 
- #>+ 5
- clean-ui:
-@@ -1354,36 +1305,36 @@
- 	rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files
- 
- #>+ 11
--libkghostviewlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgvshell.cpp $(srcdir)/kgvdocument.cpp $(srcdir)/kgv_miniwidget.cpp $(srcdir)/marklist.cpp $(srcdir)/logwindow.cpp $(srcdir)/infodialog.cpp $(srcdir)/kgvpageview.cpp $(srcdir)/kgv_view.cpp $(srcdir)/scrollbox.cpp $(srcdir)/kgvpagedecorator.cpp $(srcdir)/kgvconfigdialog.cpp $(srcdir)/kgvmainwidget.cpp $(srcdir)/kdscerrordialog.cpp $(srcdir)/displayoptions.cpp $(srcdir)/kpswidget.cpp $(srcdir)/fullscreenfilter.cpp $(srcdir)/kgvfactory.cpp $(srcdir)/thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp  kgvpageview.moc thumbnailservice.moc infodialog.moc kgvdocument.moc scrollbox.moc gssettingswidget.moc logwindow.moc kgv_miniwidget.moc kgv_view.moc kpswidget.moc fullscreenfilter.moc kgvshell.moc marklist.moc kgvconfigdialog.moc generalsettingswidget.moc kdscerrordialog.moc kgvmainwidget.moc
--	@echo 'creating libkghostviewlib_la.all_cpp.cpp ...'; \
--	rm -f libkghostviewlib_la.all_cpp.files libkghostviewlib_la.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \
-+libkghostviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgvshell.cpp $(srcdir)/kgvdocument.cpp $(srcdir)/kgv_miniwidget.cpp $(srcdir)/marklist.cpp $(srcdir)/logwindow.cpp $(srcdir)/infodialog.cpp $(srcdir)/kgvpageview.cpp $(srcdir)/kgv_view.cpp $(srcdir)/scrollbox.cpp $(srcdir)/kgvpagedecorator.cpp $(srcdir)/kgvconfigdialog.cpp $(srcdir)/kgvmainwidget.cpp $(srcdir)/kdscerrordialog.cpp $(srcdir)/displayoptions.cpp $(srcdir)/kpswidget.cpp $(srcdir)/fullscreenfilter.cpp $(srcdir)/kgvfactory.cpp $(srcdir)/thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp  kpswidget.moc marklist.moc kgvmainwidget.moc kgvconfigdialog.moc kgv_view.moc infodialog.moc kgv_miniwidget.moc kgvpageview.moc thumbnailservice.moc kgvdocument.moc kdscerrordialog.moc gssettingswidget.moc fullscreenfilter.moc logwindow.moc generalsettingswidget.moc kgvshell.moc scrollbox.moc
-+	@echo 'creating libkghostviewpart_la.all_cpp.cpp ...'; \
-+	rm -f libkghostviewpart_la.all_cpp.files libkghostviewpart_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkghostviewpart_la.all_cpp.final; \
- 	for file in kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp marklist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp kgvconfigdialog.cpp kgvmainwidget.cpp kdscerrordialog.cpp displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp kgvfactory.cpp thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp ; do \
--	  echo "#include \"$$file\"" >> libkghostviewlib_la.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkghostviewlib_la.all_cpp.final; \
-+	  echo "#include \"$$file\"" >> libkghostviewpart_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkghostviewpart_la.all_cpp.final; \
- 	done; \
--	cat libkghostviewlib_la.all_cpp.final libkghostviewlib_la.all_cpp.files > libkghostviewlib_la.all_cpp.cpp; \
--	rm -f libkghostviewlib_la.all_cpp.final libkghostviewlib_la.all_cpp.files
-+	cat libkghostviewpart_la.all_cpp.final libkghostviewpart_la.all_cpp.files > libkghostviewpart_la.all_cpp.cpp; \
-+	rm -f libkghostviewpart_la.all_cpp.final libkghostviewpart_la.all_cpp.files
- 
- #>+ 3
- clean-final:
--	-rm -f libdscparse_la.all_cpp.cpp libkghostviewlib_la.all_cpp.cpp
-+	-rm -f libdscparse_la.all_cpp.cpp libkghostviewpart_la.all_cpp.cpp
- 
- #>+ 3
- final:
--	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_final_OBJECTS)" all-am
-+	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_final_OBJECTS)" all-am
- 
- #>+ 3
- final-install:
--	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_final_OBJECTS)" install-am
-+	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_final_OBJECTS)" install-am
- 
- #>+ 3
- no-final:
--	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_nofinal_OBJECTS)" all-am
- 
- #>+ 3
- no-final-install:
--	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_nofinal_OBJECTS)" install-am
- 
- #>+ 3
- cvs-clean:
-@@ -1394,75 +1345,61 @@
- 	-rm -f *.rpo
- 
- #>+ 54
--kgvconfigdialog.lo: kgvconfigdialog.moc 
--fullscreenfilter.o: fullscreenfilter.moc 
-+$(srcdir)/kgvdocument.cpp: generalsettingswidget.h gssettingswidget.h 
- $(srcdir)/fullscreenfilter.cpp: generalsettingswidget.h gssettingswidget.h 
--infodialog.lo: infodialog.moc 
--kgvmainwidget.o: kgvmainwidget.moc 
--viewcontrol.o: viewcontrol.moc 
--$(srcdir)/infodialog.cpp: generalsettingswidget.h gssettingswidget.h 
-+nmcheck-am: nmcheck
-+$(srcdir)/kdscerrordialog.cpp: generalsettingswidget.h gssettingswidget.h 
- $(srcdir)/kgv_miniwidget.cpp: generalsettingswidget.h gssettingswidget.h 
-+$(srcdir)/kgvpagedecorator.cpp: generalsettingswidget.h gssettingswidget.h 
-+kgvpageview.o: kgvpageview.moc 
-+infodialog.lo: infodialog.moc 
-+viewcontrol.lo: viewcontrol.moc 
-+logwindow.o: logwindow.moc 
-+infodialog.o: infodialog.moc 
-+marklist.lo: marklist.moc 
- $(srcdir)/thumbnailservice.cpp: generalsettingswidget.h gssettingswidget.h 
--kgvconfigdialog.o: kgvconfigdialog.moc 
--$(srcdir)/kgvconfigdialog.cpp: generalsettingswidget.h gssettingswidget.h 
--$(srcdir)/logwindow.cpp: generalsettingswidget.h gssettingswidget.h 
--$(srcdir)/kpswidget.cpp: generalsettingswidget.h gssettingswidget.h 
--fullscreenfilter.lo: fullscreenfilter.moc 
--kpswidget.o: kpswidget.moc 
-+kgvmainwidget.lo: kgvmainwidget.moc 
-+kgvdocument.o: kgvdocument.moc 
-+thumbnailservice.o: thumbnailservice.moc 
-+$(srcdir)/marklist.cpp: generalsettingswidget.h gssettingswidget.h 
-+$(srcdir)/kgvfactory.cpp: generalsettingswidget.h gssettingswidget.h 
-+$(srcdir)/kgvpageview.cpp: generalsettingswidget.h gssettingswidget.h 
-+viewcontrol.o: viewcontrol.moc 
- kgvpageview.lo: kgvpageview.moc 
--kgvpageview.o: kgvpageview.moc 
-+nmcheck: 
- kgv_miniwidget.o: kgv_miniwidget.moc 
-+kgvconfigdialog.o: kgvconfigdialog.moc 
-+kgv_miniwidget.lo: kgv_miniwidget.moc 
-+$(srcdir)/kgvshell.cpp: generalsettingswidget.h gssettingswidget.h 
- $(srcdir)/displayoptions.cpp: generalsettingswidget.h gssettingswidget.h 
--kgv_view.o: kgv_view.moc 
--$(srcdir)/kgvdocument.cpp: generalsettingswidget.h gssettingswidget.h 
--kgv_view.lo: kgv_view.moc 
--$(srcdir)/kgv_view.cpp: generalsettingswidget.h gssettingswidget.h 
--kgvmainwidget.lo: kgvmainwidget.moc 
--kdscerrordialog.o: kdscerrordialog.moc 
--kgvshell.lo: kgvshell.moc 
-+$(srcdir)/kgvconfigdialog.cpp: generalsettingswidget.h gssettingswidget.h 
- $(srcdir)/ps.c: generalsettingswidget.h gssettingswidget.h 
--marklist.lo: marklist.moc 
--kdscerrordialog.lo: kdscerrordialog.moc 
- scrollbox.o: scrollbox.moc 
--nmcheck-am: nmcheck
--$(srcdir)/kgvpageview.cpp: generalsettingswidget.h gssettingswidget.h 
--$(srcdir)/kgvshell.cpp: generalsettingswidget.h gssettingswidget.h 
--scrollbox.lo: scrollbox.moc 
-+kgv_view.o: kgv_view.moc 
-+$(srcdir)/logwindow.cpp: generalsettingswidget.h gssettingswidget.h 
-+marklist.o: marklist.moc 
-+$(srcdir)/scrollbox.cpp: generalsettingswidget.h gssettingswidget.h 
-+kdscerrordialog.lo: kdscerrordialog.moc 
-+kgvconfigdialog.lo: kgvconfigdialog.moc 
-+kgv_view.lo: kgv_view.moc 
- $(srcdir)/kgvmainwidget.cpp: generalsettingswidget.h gssettingswidget.h 
--kgvdocument.lo: kgvdocument.moc 
--kgvshell.o: kgvshell.moc 
--$(srcdir)/kgvpagedecorator.cpp: generalsettingswidget.h gssettingswidget.h 
--kgvdocument.o: kgvdocument.moc 
--kpswidget.lo: kpswidget.moc 
--$(srcdir)/kdscerrordialog.cpp: generalsettingswidget.h gssettingswidget.h 
--kgv_miniwidget.lo: kgv_miniwidget.moc 
--$(srcdir)/marklist.cpp: generalsettingswidget.h gssettingswidget.h 
--infodialog.o: infodialog.moc 
- thumbnailservice.lo: thumbnailservice.moc 
--$(srcdir)/scrollbox.cpp: generalsettingswidget.h gssettingswidget.h 
--marklist.o: marklist.moc 
--viewcontrol.lo: viewcontrol.moc 
--$(srcdir)/kgvfactory.cpp: generalsettingswidget.h gssettingswidget.h 
-+kgvshell.lo: kgvshell.moc 
-+kpswidget.o: kpswidget.moc 
-+$(srcdir)/infodialog.cpp: generalsettingswidget.h gssettingswidget.h 
-+$(srcdir)/kpswidget.cpp: generalsettingswidget.h gssettingswidget.h 
-+kpswidget.lo: kpswidget.moc 
-+scrollbox.lo: scrollbox.moc 
-+fullscreenfilter.o: fullscreenfilter.moc 
- logwindow.lo: logwindow.moc 
--thumbnailservice.o: thumbnailservice.moc 
--nmcheck: 
--logwindow.o: logwindow.moc 
-+kgvmainwidget.o: kgvmainwidget.moc 
-+$(srcdir)/kgv_view.cpp: generalsettingswidget.h gssettingswidget.h 
-+kgvshell.o: kgvshell.moc 
-+fullscreenfilter.lo: fullscreenfilter.moc 
-+kgvdocument.lo: kgvdocument.moc 
-+kdscerrordialog.o: kdscerrordialog.moc 
- 
- #>+ 28
--generalsettingswidget.cpp: $(srcdir)/generalsettingswidget.ui generalsettingswidget.h generalsettingswidget.moc
--	rm -f generalsettingswidget.cpp
--	echo '#include <klocale.h>' > generalsettingswidget.cpp
--	$(UIC) -tr ${UIC_TR} -i generalsettingswidget.h $(srcdir)/generalsettingswidget.ui > generalsettingswidget.cpp.temp ; ret=$$?; \
--	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" generalsettingswidget.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_generalsettingswidget,g" >> generalsettingswidget.cpp ;\
--	rm -f generalsettingswidget.cpp.temp ;\
--	if test "$$ret" = 0; then echo '#include "generalsettingswidget.moc"' >> generalsettingswidget.cpp; else rm -f generalsettingswidget.cpp ; exit $$ret ; fi
--
--generalsettingswidget.h: $(srcdir)/generalsettingswidget.ui
--	$(UIC) -o generalsettingswidget.h $(srcdir)/generalsettingswidget.ui
--
--generalsettingswidget.moc: generalsettingswidget.h
--	$(MOC) generalsettingswidget.h -o generalsettingswidget.moc
--
- gssettingswidget.cpp: $(srcdir)/gssettingswidget.ui gssettingswidget.h gssettingswidget.moc
- 	rm -f gssettingswidget.cpp
- 	echo '#include <klocale.h>' > gssettingswidget.cpp
-@@ -1476,3 +1413,17 @@
- 
- gssettingswidget.moc: gssettingswidget.h
- 	$(MOC) gssettingswidget.h -o gssettingswidget.moc
-+
-+generalsettingswidget.cpp: $(srcdir)/generalsettingswidget.ui generalsettingswidget.h generalsettingswidget.moc
-+	rm -f generalsettingswidget.cpp
-+	echo '#include <klocale.h>' > generalsettingswidget.cpp
-+	$(UIC) -tr ${UIC_TR} -i generalsettingswidget.h $(srcdir)/generalsettingswidget.ui > generalsettingswidget.cpp.temp ; ret=$$?; \
-+	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" generalsettingswidget.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_generalsettingswidget,g" >> generalsettingswidget.cpp ;\
-+	rm -f generalsettingswidget.cpp.temp ;\
-+	if test "$$ret" = 0; then echo '#include "generalsettingswidget.moc"' >> generalsettingswidget.cpp; else rm -f generalsettingswidget.cpp ; exit $$ret ; fi
-+
-+generalsettingswidget.h: $(srcdir)/generalsettingswidget.ui
-+	$(UIC) -o generalsettingswidget.h $(srcdir)/generalsettingswidget.ui
-+
-+generalsettingswidget.moc: generalsettingswidget.h
-+	$(MOC) generalsettingswidget.h -o generalsettingswidget.moc