rev 4088 - kde-extras/kipi-plugins/trunk/debian/patches
Tom Albers
tomalbers-guest at costa.debian.org
Sun Jul 9 00:00:22 UTC 2006
Author: tomalbers-guest
Date: 2006-07-08 23:59:28 +0000 (Sat, 08 Jul 2006)
New Revision: 4088
Modified:
kde-extras/kipi-plugins/trunk/debian/patches/98_buildprep.diff
Log:
Buildprep
Modified: kde-extras/kipi-plugins/trunk/debian/patches/98_buildprep.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/98_buildprep.diff 2006-07-08 19:16:16 UTC (rev 4087)
+++ kde-extras/kipi-plugins/trunk/debian/patches/98_buildprep.diff 2006-07-08 23:59:28 UTC (rev 4088)
@@ -1,571 +1,5 @@
#DPATCHLEVEL=0
# vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,55 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
-+ $(srcdir)/admin/deps.am $(srcdir)/config.h.in \
-+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-+ TODO admin/compile admin/config.guess admin/config.sub \
-+ admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
-+ admin/mkinstalldirs admin/ylwrap
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+ { test ! -d $(distdir) \
-+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +222,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -235,6 +285,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +358,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -329,63 +382,64 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- AUTOMAKE_OPTIONS = foreign 1.5
--
- COMPILE_FIRST = libkexif libkipi
- SUBDIRS = $(TOPSUBDIRS)
--subdir = .
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
-- $(srcdir)/admin/deps.am $(srcdir)/configure AUTHORS COPYING \
-- ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 aclocal.m4 \
-- admin/compile admin/config.guess admin/config.sub admin/depcomp \
-- admin/install-sh admin/ltmain.sh admin/missing \
-- admin/mkinstalldirs admin/ylwrap config.h.in configure \
-- configure.in
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: config.h
- #>+ 1
- all: docs-am config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
- .SUFFIXES:
--
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno
--$(srcdir)/Makefile.in: Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+am--refresh:
-+ @:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+#>- @for dep in $?; do \
-+#>- case '$(am__configure_deps)' in \
-+#>- *$$dep*) \
-+#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- #>- cd $(top_srcdir) && \
- #>- $(AUTOMAKE) --foreign Makefile
--#>+ 3
-+#>+ 14
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+ ( \
-+ cd $(srcdir) && $(AUTOMAKE) --foreign \
-+ ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ echo ' $(SHELL) ./config.status'; \
-+ $(SHELL) ./config.status;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+ esac;
-
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+
-+$(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): configure.in acinclude.m4
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -397,10 +451,10 @@
- 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: $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
-- touch $(srcdir)/config.h.in
-+ rm -f stamp-h1
-+ touch $@
-
- distclean-hdr:
- -rm -f config.h stamp-h1
-@@ -422,7 +476,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 \
-@@ -434,7 +494,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; \
-@@ -442,7 +502,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)' ;; \
-@@ -463,7 +529,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 \
-@@ -474,14 +540,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -490,19 +548,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -512,10 +573,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -538,26 +600,11 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = .
--distdir = $(PACKAGE)-$(VERSION)
--
--am__remove_distdir = \
-- { test ! -d $(distdir) \
-- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-- && rm -fr $(distdir); }; }
--
--GZIP_ENV = --best
--distuninstallcheck_listfiles = find . -type f -print
--distcleancheck_listfiles = find . -type f -print
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkinstalldirs) $(distdir)/./admin $(distdir)/admin
-+ $(mkdir_p) $(distdir)/admin
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
-@@ -569,7 +616,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -584,15 +631,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -603,19 +652,46 @@
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+ $(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+ $(am__remove_distdir)
-+
-+dist-shar: distdir
-+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+ $(am__remove_distdir)
-+
-+dist-zip: distdir
-+ -rm -f $(distdir).zip
-+ zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
- dist dist-all: distdir
-- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
- # This target untars the dist file and tries a VPATH configuration. Then
- # it guarantees that the distribution is self-contained by making another
- # tarfile.
- distcheck: dist
-- $(am__remove_distdir)
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-+ case '$(DIST_ARCHIVES)' in \
-+ *.tar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ *.tar.bz2*) \
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.Z*) \
-+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+ *.shar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ *.zip*) \
-+ unzip $(distdir).zip ;;\
-+ esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
-@@ -635,19 +711,20 @@
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
-- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
-- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-- && rm -f $(distdir).tar.gz \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist \
-+ && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
-- @echo "$(distdir).tar.gz is ready for distribution" | \
-- sed 'h;s/./=/g;p;x;p;x'
-+ @(echo "$(distdir) archives ready for distribution: "; \
-+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -671,7 +748,6 @@
- all-am: Makefile config.h
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -691,7 +767,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -707,13 +783,15 @@
- distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-hdr \
-+ distclean-libtool distclean-tags
-
- dvi: dvi-recursive
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -750,24 +828,21 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive dist dist-all dist-gzip distcheck distclean \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+ check-am clean clean-generic clean-libtool clean-recursive \
-+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+ dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
-- distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-- info-recursive install install-am install-data install-data-am \
-- install-data-local install-data-recursive install-exec \
-- install-exec-am install-exec-recursive install-info \
-- install-info-am install-info-recursive install-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-local uninstall-recursive
-+ distuninstallcheck dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am \
-+ install-data-local install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am uninstall-local
-
- $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
- @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
-@@ -884,15 +959,16 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files RELEASE.rev Makefile.cvs kipi-plugins.lsm configure.in.in Makefile.am.in
-+KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files RELEASE.rev config.h.in configure.in Makefile.cvs kipi-plugins.lsm aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 7
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign Makefile
-+ \
-+ cd $(srcdir) && $(AUTOMAKE) --foreign \
-+
- cd $(top_srcdir) && perl admin/am_edit Makefile.in
-
-
--- acinclude.m4
+++ acinclude.m4
@@ -2144,9 +2144,6 @@
@@ -4398,7 +3832,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND LIBKIPI_CFLAGS LIBKIPI_LIBS LIBKIPI_LIBS_DEP PKG_CONFIG LIBKEXIF_CFLAGS LIBKEXIF_LIBS LIBKEXIF_LIBS_DEP compile_LIBKEXIF_TRUE compile_LIBKEXIF_FALSE GPHOTO_CONFIG GPHOTO_PORT_CONFIG GPHOTO_CFLAGS LIB_GPHOTO compile_KAMERAKLIENT_TRUE compile_KAMERAKLIENT_FALSE XSLT_CONFIG LIBXSLT_CFLAGS LIBXSLT_LIBS compile_HTMLEXPORT_TRUE compile_HTMLEXPORT_FALSE MAGICK_CONFIG LIBMAGICK_CFLAGS LIBMAGICK_LIBS GL_LIBS LIB_IMLIB2 IMLIB2_CFLAGS compile_SLIDESHOW_TRUE compile_SLIDESHOW_FALSE LIB_TIFF compile_ACQUIREIMAGES_TRUE compile_ACQUIREIMAGES_FALSE compile_RAWCONVERTER_TRUE compile_RAWCONVERTER_FALSE compile_TIMEADJUST_TRUE compile_TIMEADJUST_FALSE compile_JPEGLOSSLESS_TRUE compile_JPEGLOSSLESS_FALSE TOPSUBDIRS libkexif_SUBDIR_included_TRUE libkexif_SUBDIR_included_FALSE libkipi_SUBDIR_included_TRUE libkipi_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kipi_plugins_SUBDIR_included_TRUE kipi_plugins_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND LIBKIPI_CFLAGS LIBKIPI_LIBS LIBKIPI_LIBS_DEP PKG_CONFIG LIBKEXIF_CFLAGS LIBKEXIF_LIBS LIBKEXIF_LIBS_DEP compile_LIBKEXIF_TRUE compile_LIBKEXIF_FALSE GPHOTO_CONFIG GPHOTO_PORT_CONFIG GPHOTO_CFLAGS LIB_GPHOTO compile_KAMERAKLIENT_TRUE compile_KAMERAKLIENT_FALSE XSLT_CONFIG LIBXSLT_CFLAGS LIBXSLT_LIBS compile_HTMLEXPORT_TRUE compile_HTMLEXPORT_FALSE MAGICK_CONFIG LIBMAGICK_CFLAGS LIBMAGICK_LIBS GL_LIBS LIB_IMLIB2 IMLIB2_CFLAGS compile_SLIDESHOW_TRUE compile_SLIDESHOW_FALSE LIB_TIFF compile_ACQUIREIMAGES_TRUE compile_ACQUIREIMAGES_FALSE compile_RAWCONVERTER_TRUE compile_RAWCONVERTER_FALSE compile_TIMEADJUST_TRUE compile_TIMEADJUST_FALSE compile_JPEGLOSSLESS_TRUE compile_JPEGLOSSLESS_FALSE TOPSUBDIRS libkexif_SUBDIR_included_TRUE libkexif_SUBDIR_included_FALSE libkipi_SUBDIR_included_TRUE libkipi_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kipi_plugins_SUBDIR_included_TRUE kipi_plugins_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND LIBKIPI_CFLAGS LIBKIPI_LIBS LIBKIPI_LIBS_DEP PKG_CONFIG LIBKEXIF_CFLAGS LIBKEXIF_LIBS LIBKEXIF_LIBS_DEP compile_LIBKEXIF_TRUE compile_LIBKEXIF_FALSE GPHOTO_CONFIG GPHOTO_PORT_CONFIG GPHOTO_CFLAGS LIB_GPHOTO compile_KAMERAKLIENT_TRUE compile_KAMERAKLIENT_FALSE XSLT_CONFIG LIBXSLT_CFLAGS LIBXSLT_LIBS compile_HTMLEXPORT_TRUE compile_HTMLEXPORT_FALSE MAGICK_CONFIG LIBMAGICK_CFLAGS LIBMAGICK_LIBS GL_LIBS LIB_IMLIB2 IMLIB2_CFLAGS compile_SLIDESHOW_TRUE compile_SLIDESHOW_FALSE LIB_TIFF compile_ACQUIREIMAGES_TRUE compile_ACQUIREIMAGES_FALSE compile_RAWCONVERTER_TRUE compile_RAWCONVERTER_FALSE compile_TIMEADJUST_TRUE compile_TIMEADJUST_FALSE compile_JPEGLOSSLESS_TRUE compile_JPEGLOSSLESS_FALSE TOPSUBDIRS libkexif_SUBDIR_included_TRUE libkexif_SUBDIR_included_FALSE libkipi_SUBDIR_included_TRUE libkipi_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kipi_plugins_SUBDIR_included_TRUE kipi_plugins_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
@@ -4412,116 +3846,10 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1036,8 +1038,8 @@
- work!)
- --disable-warnings disables compilation with -Wall and similar
- --enable-profile creates profiling infos default=no
-- --disable-dependency-tracking Speeds up one-time builds
-- --enable-dependency-tracking Do not reject slow dependency extractors
-+ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors
- --enable-pch enables precompiled header support (currently only
- KCC or gcc >=3.4+unsermake) default=no
- --enable-coverage use gcc coverage testing
-@@ -1190,7 +1192,7 @@
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
+@@ -2093,6 +2095,31 @@
-@@ -1661,7 +1663,7 @@
- rm conftest.sed
--am__api_version="1.7"
-+am__api_version="1.9"
-
-
- test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-@@ -1819,7 +1821,6 @@
- fi
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-
-@@ -1833,6 +1834,39 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+ # We used to keeping the `.' as first argument, in order to
-+ # allow $(mkdir_p) to be used without argument. As in
-+ # $(mkdir_p) $(somedir)
-+ # where $(somedir) is conditionally defined. However this is wrong
-+ # for two reasons:
-+ # 1. if the package is installed by a user who cannot write `.'
-+ # make install will fail,
-+ # 2. the above comment should most certainly read
-+ # $(mkdir_p) $(DESTDIR)$(somedir)
-+ # so it does not work when $(somedir) is undefined and
-+ # $(DESTDIR) is not.
-+ # To support the latter case, we have to write
-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+ # so the `.' trick is pointless.
-+ mkdir_p='mkdir -p --'
-+else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ for d in ./-p ./--version;
-+ do
-+ test -d $d && rmdir $d
-+ done
-+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+ if test -f "$ac_aux_dir/mkinstalldirs"; then
-+ mkdir_p='$(mkinstalldirs)'
-+ else
-+ mkdir_p='$(install_sh) -d'
-+ fi
-+fi
-+
- for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -1911,7 +1945,7 @@
- fi
- rmdir .tst 2>/dev/null
-
-- # test to see if srcdir already configured
-+# test to see if srcdir already configured
- if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-@@ -1959,9 +1993,6 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--
--AMTAR=${AMTAR-"${am_missing_run}tar"}
--
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
-@@ -2054,6 +2085,38 @@
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -4544,428 +3872,13 @@
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+ unset CDPATH
-
-@@ -2990,8 +3053,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3049,8 +3111,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3166,8 +3227,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3221,8 +3281,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3267,8 +3326,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3312,8 +3370,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3393,7 +3450,9 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -3421,9 +3480,14 @@
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
-@@ -3863,8 +3927,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3922,8 +3985,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3994,8 +4056,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4039,8 +4100,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4114,7 +4174,9 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -4142,9 +4204,14 @@
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
-@@ -4211,8 +4278,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4323,8 +4389,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4412,8 +4477,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4515,8 +4579,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4615,8 +4678,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4700,8 +4762,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4790,8 +4851,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4878,8 +4938,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4966,8 +5025,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5074,8 +5132,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5168,8 +5225,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5256,8 +5312,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5344,8 +5399,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5432,8 +5486,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5548,8 +5601,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5641,8 +5693,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5730,8 +5781,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5818,8 +5868,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5906,8 +5955,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5994,8 +6042,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6082,8 +6129,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6506,8 +6552,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6633,8 +6678,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6722,8 +6766,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6853,8 +6896,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6933,8 +6975,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7162,7 +7203,7 @@
+@@ -7176,7 +7203,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -4974,7 +3887,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7267,7 +7308,7 @@
+@@ -7281,7 +7308,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -4983,7 +3896,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7301,7 +7342,7 @@
+@@ -7315,7 +7342,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4992,7 +3905,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7331,6 +7372,15 @@
+@@ -7345,6 +7372,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -5008,7 +3921,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7341,36 +7391,43 @@
+@@ -7355,36 +7391,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -5076,7 +3989,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-@@ -7417,44 +7474,36 @@
+@@ -7431,44 +7474,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -5131,7 +4044,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7470,7 +7519,7 @@
+@@ -7484,7 +7519,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -5140,7 +4053,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7486,43 +7535,27 @@
+@@ -7500,43 +7535,27 @@
esac
;;
@@ -5197,7 +4110,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7541,32 +7574,22 @@
+@@ -7555,32 +7574,22 @@
;;
openbsd*)
@@ -5233,7 +4146,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7587,10 +7610,13 @@
+@@ -7601,10 +7610,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5248,7 +4161,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -7606,6 +7632,9 @@
+@@ -7620,6 +7632,9 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5258,16 +4171,16 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-@@ -7640,7 +7669,7 @@
+@@ -7654,7 +7669,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7643 "configure"' > conftest.$ac_ext
+- echo '#line 7657 "configure"' > conftest.$ac_ext
+ echo '#line 7672 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7683,14 +7712,13 @@
+@@ -7697,14 +7712,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -5284,7 +4197,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7702,7 +7730,6 @@
+@@ -7716,7 +7730,6 @@
esac
;;
*64-bit*)
@@ -5292,17 +4205,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7762,8 +7789,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -7798,6 +7824,26 @@
+@@ -7811,6 +7824,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -5329,37 +4232,7 @@
esac
-@@ -7838,8 +7884,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8009,8 +8054,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8077,8 +8121,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8193,6 +8236,243 @@
+@@ -8203,6 +8236,243 @@
done
@@ -5603,36 +4476,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8285,7 +8565,7 @@
+@@ -8295,7 +8565,7 @@
# Provide some information about the compiler.
--echo "$as_me:8288:" \
+-echo "$as_me:8298:" \
+echo "$as_me:8568:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8331,8 +8611,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8381,8 +8660,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -8440,7 +8718,7 @@
+@@ -8448,7 +8718,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -5641,7 +4494,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8469,20 +8747,70 @@
+@@ -8477,20 +8747,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -5718,7 +4571,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8519,9 +8847,6 @@
+@@ -8527,9 +8847,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -5728,7 +4581,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8543,14 +8868,30 @@
+@@ -8551,14 +8868,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -5761,7 +4614,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8568,14 +8909,17 @@
+@@ -8576,14 +8909,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -5781,7 +4634,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8737,7 +9081,7 @@
+@@ -8745,7 +9081,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -5790,7 +4643,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8757,7 +9101,7 @@
+@@ -8765,7 +9101,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -5799,7 +4652,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9014,6 +9358,7 @@
+@@ -9022,6 +9358,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -5807,7 +4660,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9033,15 +9378,26 @@
+@@ -9041,15 +9378,26 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -5836,7 +4689,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -9067,7 +9423,7 @@
+@@ -9075,7 +9423,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5845,7 +4698,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9129,7 +9485,7 @@
+@@ -9137,7 +9485,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5854,7 +4707,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9224,70 +9580,31 @@
+@@ -9232,68 +9580,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5923,8 +4776,6 @@
- lt_prog_compiler_static=
-fi
-
--
--
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
@@ -5937,16 +4788,10 @@
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
-+
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
- lt_prog_compiler_no_builtin_flag=
-@@ -9310,18 +9627,20 @@
+ ## CAVEAT EMPTOR:
+@@ -9322,18 +9627,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -5954,12 +4799,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9316: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9328: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9320: \$? = $ac_status" >&5
+- echo "$as_me:9332: \$? = $ac_status" >&5
+ echo "$as_me:9637: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -5972,7 +4817,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9382,6 +9701,11 @@
+@@ -9394,6 +9701,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -5984,7 +4829,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9398,7 +9722,7 @@
+@@ -9410,7 +9722,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5993,7 +4838,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9424,6 +9748,16 @@
+@@ -9436,6 +9748,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -6010,7 +4855,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9435,7 +9769,7 @@
+@@ -9447,7 +9769,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6019,7 +4864,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9458,13 +9792,20 @@
+@@ -9470,13 +9792,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -6042,7 +4887,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9479,15 +9820,15 @@
+@@ -9491,15 +9820,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -6064,7 +4909,7 @@
;;
sunos4*)
-@@ -9496,7 +9837,7 @@
+@@ -9508,7 +9837,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -6073,7 +4918,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9509,6 +9850,17 @@
+@@ -9521,6 +9850,17 @@
fi
;;
@@ -6091,7 +4936,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9543,18 +9895,20 @@
+@@ -9555,18 +9895,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -6099,12 +4944,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9549: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9561: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9901: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9553: \$? = $ac_status" >&5
+- echo "$as_me:9565: \$? = $ac_status" >&5
+ echo "$as_me:9905: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -6117,7 +4962,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9575,7 +9929,7 @@
+@@ -9587,7 +9929,7 @@
fi
fi
@@ -6126,7 +4971,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9585,6 +9939,48 @@
+@@ -9597,6 +9939,48 @@
;;
esac
@@ -6175,7 +5020,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9597,38 +9993,36 @@
+@@ -9609,38 +9993,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6196,12 +5041,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9628: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10005: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9620: \$? = $ac_status" >&5
+- echo "$as_me:9632: \$? = $ac_status" >&5
+ echo "$as_me:10009: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -6226,7 +5071,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9699,6 +10093,16 @@
+@@ -9711,6 +10093,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -6243,7 +5088,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9709,6 +10113,10 @@
+@@ -9721,6 +10113,10 @@
with_gnu_ld=no
fi
;;
@@ -6254,7 +5099,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9719,6 +10127,27 @@
+@@ -9731,6 +10127,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -6282,7 +5127,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9756,7 +10185,7 @@
+@@ -9768,7 +10185,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6291,7 +5136,7 @@
else
ld_shlibs=no
fi
-@@ -9766,13 +10195,13 @@
+@@ -9778,13 +10195,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -6308,7 +5153,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9781,23 +10210,70 @@
+@@ -9793,23 +10210,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6384,7 +5229,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9811,13 +10287,40 @@
+@@ -9823,13 +10287,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6427,7 +5272,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9827,24 +10330,19 @@
+@@ -9839,24 +10330,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6459,7 +5304,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9856,7 +10354,7 @@
+@@ -9868,7 +10354,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -6468,7 +5313,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9878,9 +10376,21 @@
+@@ -9890,9 +10376,21 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -6492,7 +5337,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9897,7 +10407,7 @@
+@@ -9909,7 +10407,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -6501,7 +5346,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9916,8 +10426,12 @@
+@@ -9928,8 +10426,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -6514,7 +5359,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9925,22 +10439,23 @@
+@@ -9937,22 +10439,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -6545,17 +5390,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9964,8 +10479,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -9992,14 +10506,13 @@
+@@ -10003,14 +10506,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6573,17 +5408,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10026,8 +10539,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -10059,13 +10571,11 @@
+@@ -10069,13 +10571,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -6600,7 +5425,7 @@
fi
fi
;;
-@@ -10078,7 +10588,7 @@
+@@ -10088,7 +10588,7 @@
ld_shlibs=no
;;
@@ -6609,7 +5434,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10088,13 +10598,13 @@
+@@ -10098,13 +10598,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -6626,30 +5451,11 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -10104,52 +10614,52 @@
+@@ -10114,52 +10614,52 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
-- archive_cmds_need_lc=no
-- case "$host_os" in
-- rhapsody* | darwin1.[012])
-- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- ;;
-- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
@@ -6668,7 +5474,27 @@
+ esac
+ fi
+ ;;
- esac
++ esac
+ archive_cmds_need_lc=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.012)
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -6687,7 +5513,6 @@
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds_need_lc=no
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -6719,7 +5544,7 @@
fi
;;
-@@ -10183,8 +10693,8 @@
+@@ -10193,8 +10693,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6730,7 +5555,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10192,7 +10702,7 @@
+@@ -10202,7 +10702,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6739,7 +5564,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10206,47 +10716,62 @@
+@@ -10216,47 +10716,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -6826,7 +5651,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10260,7 +10785,7 @@
+@@ -10270,7 +10785,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6835,7 +5660,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10270,7 +10795,7 @@
+@@ -10280,7 +10795,7 @@
link_all_deplibs=yes
;;
@@ -6844,7 +5669,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10293,7 +10818,8 @@
+@@ -10303,7 +10818,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -6854,7 +5679,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10303,7 +10829,7 @@
+@@ -10313,7 +10829,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6863,7 +5688,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10314,14 +10840,14 @@
+@@ -10324,14 +10840,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6880,7 +5705,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10333,13 +10859,13 @@
+@@ -10343,13 +10859,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6896,7 +5721,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10347,21 +10873,15 @@
+@@ -10357,21 +10873,15 @@
hardcode_libdir_separator=:
;;
@@ -6922,7 +5747,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10370,8 +10890,18 @@
+@@ -10380,8 +10890,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6943,7 +5768,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10380,7 +10910,7 @@
+@@ -10390,7 +10910,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -6952,7 +5777,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10428,36 +10958,45 @@
+@@ -10438,36 +10958,45 @@
fi
;;
@@ -7019,7 +5844,7 @@
;;
uts4*)
-@@ -10476,11 +11015,6 @@
+@@ -10486,11 +11015,6 @@
echo "${ECHO_T}$ld_shlibs" >&6
test "$ld_shlibs" = no && can_build_shared=no
@@ -7031,7 +5856,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10513,6 +11047,7 @@
+@@ -10523,6 +11047,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -7039,7 +5864,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10548,7 +11083,7 @@
+@@ -10558,7 +11083,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7048,7 +5873,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10558,7 +11093,20 @@
+@@ -10568,7 +11093,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7070,7 +5895,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10623,7 +11171,7 @@
+@@ -10633,7 +11171,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7079,7 +5904,7 @@
;;
beos*)
-@@ -10632,7 +11180,7 @@
+@@ -10642,7 +11180,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7088,7 +5913,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10648,7 +11196,7 @@
+@@ -10658,7 +11196,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7097,7 +5922,7 @@
need_version=no
need_lib_prefix=no
-@@ -10660,7 +11208,8 @@
+@@ -10670,7 +11208,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7107,7 +5932,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10690,7 +11239,7 @@
+@@ -10700,7 +11239,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7116,7 +5941,7 @@
;;
esac
;;
-@@ -10713,7 +11262,7 @@
+@@ -10723,7 +11262,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7125,7 +5950,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10736,20 +11285,17 @@
+@@ -10746,20 +11285,17 @@
dynamic_linker=no
;;
@@ -7157,7 +5982,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10767,14 +11313,19 @@
+@@ -10777,14 +11313,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7179,7 +6004,7 @@
esac
;;
-@@ -10794,9 +11345,9 @@
+@@ -10804,9 +11345,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7191,7 +6016,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10811,7 +11362,7 @@
+@@ -10821,7 +11362,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7200,7 +6025,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10822,7 +11373,7 @@
+@@ -10832,7 +11373,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7209,7 +6034,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10834,6 +11385,18 @@
+@@ -10844,6 +11385,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -7228,7 +6053,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10877,29 +11440,26 @@
+@@ -10887,29 +11440,26 @@
;;
# This must be Linux ELF.
@@ -7265,7 +6090,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10909,6 +11469,18 @@
+@@ -10919,6 +11469,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7284,7 +6109,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10918,7 +11490,7 @@
+@@ -10928,7 +11490,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7293,7 +6118,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10946,8 +11518,13 @@
+@@ -10956,8 +11518,13 @@
openbsd*)
version_type=sunos
@@ -7308,7 +6133,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10967,7 +11544,7 @@
+@@ -10977,7 +11544,7 @@
os2*)
libname_spec='$name'
@@ -7317,7 +6142,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10985,13 +11562,6 @@
+@@ -10995,13 +11562,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -7331,7 +6156,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11017,7 +11587,7 @@
+@@ -11027,7 +11587,7 @@
need_version=yes
;;
@@ -7340,7 +6165,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11050,6 +11620,29 @@
+@@ -11060,6 +11620,29 @@
fi
;;
@@ -7370,7 +6195,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11065,12 +11658,17 @@
+@@ -11075,12 +11658,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -7390,77 +6215,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11196,8 +11794,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11300,8 +11897,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11366,8 +11962,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11460,8 +12055,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11526,8 +12120,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11593,8 +12186,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11660,8 +12252,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -11720,7 +12311,7 @@
+@@ -11723,7 +12311,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -7469,16 +6224,16 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11736,7 +12327,7 @@
+@@ -11739,7 +12327,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11739 "configure"
+-#line 11742 "configure"
+#line 12330 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11793,6 +12384,8 @@
+@@ -11796,6 +12384,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7487,7 +6242,7 @@
exit (status);
}
-@@ -11802,12 +12395,12 @@
+@@ -11805,12 +12395,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7502,7 +6257,7 @@
esac
else :
# compilation failed
-@@ -11822,7 +12415,7 @@
+@@ -11825,7 +12415,7 @@
echo "${ECHO_T}$lt_cv_dlopen_self" >&6
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -7511,16 +6266,16 @@
echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11834,7 +12427,7 @@
+@@ -11837,7 +12427,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11837 "configure"
+-#line 11840 "configure"
+#line 12430 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11891,6 +12484,8 @@
+@@ -11894,6 +12484,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7529,7 +6284,7 @@
exit (status);
}
-@@ -11900,12 +12495,12 @@
+@@ -11903,12 +12495,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7544,7 +6299,7 @@
esac
else :
# compilation failed
-@@ -11938,7 +12533,7 @@
+@@ -11941,7 +12533,7 @@
fi
@@ -7553,7 +6308,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -11950,7 +12545,7 @@
+@@ -11953,7 +12545,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7562,7 +6317,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11959,47 +12554,10 @@
+@@ -11962,47 +12554,10 @@
fi
;;
@@ -7611,7 +6366,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12025,7 +12583,8 @@
+@@ -12028,7 +12583,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7621,7 +6376,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12139,11 +12698,11 @@
+@@ -12142,11 +12698,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7635,7 +6390,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12173,6 +12732,12 @@
+@@ -12176,6 +12732,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7648,7 +6403,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12184,6 +12749,9 @@
+@@ -12187,6 +12749,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -7658,7 +6413,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12203,7 +12771,7 @@
+@@ -12206,7 +12771,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7667,7 +6422,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12234,7 +12802,7 @@
+@@ -12237,7 +12802,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7676,7 +6431,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12249,7 +12817,7 @@
+@@ -12252,7 +12817,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -7685,7 +6440,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12476,7 +13044,10 @@
+@@ -12479,7 +13044,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7697,7 +6452,7 @@
fi
-@@ -12511,6 +13082,9 @@
+@@ -12514,6 +13082,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -7707,7 +6462,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12541,7 +13115,9 @@
+@@ -12544,7 +13115,9 @@
case $tagname in
CXX)
@@ -7718,7 +6473,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12561,6 +13137,7 @@
+@@ -12564,6 +13137,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -7726,7 +6481,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12578,7 +13155,7 @@
+@@ -12581,7 +13155,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -7735,7 +6490,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12588,17 +13165,34 @@
+@@ -12591,17 +13165,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -7771,7 +6526,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12609,18 +13203,27 @@
+@@ -12612,18 +13203,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -7802,7 +6557,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12691,7 +13294,7 @@
+@@ -12694,7 +13294,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -7811,7 +6566,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12725,7 +13328,7 @@
+@@ -12728,7 +13328,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7820,7 +6575,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12744,8 +13347,8 @@
+@@ -12747,8 +13347,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -7831,7 +6586,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12771,7 +13374,7 @@
+@@ -12774,7 +13374,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -7840,7 +6595,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12802,8 +13405,23 @@
+@@ -12805,8 +13405,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -7866,7 +6621,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12820,7 +13438,7 @@
+@@ -12823,7 +13438,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -7875,7 +6630,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12839,8 +13457,12 @@
+@@ -12842,8 +13457,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -7888,7 +6643,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12849,15 +13471,16 @@
+@@ -12852,15 +13471,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7909,17 +6664,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12887,8 +13510,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -12917,13 +13539,12 @@
+@@ -12919,13 +13539,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7935,17 +6680,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12950,8 +13571,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -12983,16 +13603,26 @@
+@@ -12984,16 +13603,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -7977,7 +6712,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13006,12 +13636,12 @@
+@@ -13007,12 +13636,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -7992,7 +6727,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13020,70 +13650,81 @@
+@@ -13021,70 +13650,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8126,7 +6861,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13094,14 +13735,14 @@
+@@ -13095,14 +13735,14 @@
;;
esac
;;
@@ -8143,7 +6878,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13118,12 +13759,12 @@
+@@ -13119,12 +13759,12 @@
# location of the library.
case $cc_basename in
@@ -8159,7 +6894,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13132,11 +13773,11 @@
+@@ -13133,11 +13773,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -8173,7 +6908,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13146,33 +13787,22 @@
+@@ -13147,33 +13787,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -8214,7 +6949,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13183,17 +13813,20 @@
+@@ -13184,17 +13813,20 @@
esac
case $cc_basename in
@@ -8241,7 +6976,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13209,12 +13842,15 @@
+@@ -13210,12 +13842,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -8261,7 +6996,7 @@
;;
esac
fi
-@@ -13225,11 +13861,25 @@
+@@ -13226,11 +13861,25 @@
;;
esac
;;
@@ -8289,7 +7024,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13240,9 +13890,9 @@
+@@ -13241,9 +13890,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -8301,7 +7036,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13251,16 +13901,16 @@
+@@ -13252,16 +13901,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -8322,7 +7057,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13278,20 +13928,44 @@
+@@ -13279,20 +13928,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -8373,7 +7108,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13319,7 +13993,7 @@
+@@ -13320,7 +13993,7 @@
;;
mvs*)
case $cc_basename in
@@ -8382,7 +7117,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13329,7 +14003,7 @@
+@@ -13330,7 +14003,7 @@
;;
esac
;;
@@ -8391,7 +7126,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13340,15 +14014,31 @@
+@@ -13341,15 +14014,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -8425,7 +7160,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13358,14 +14048,14 @@
+@@ -13359,14 +14048,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -8443,7 +7178,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13383,7 +14073,7 @@
+@@ -13384,7 +14073,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8452,7 +7187,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13402,13 +14092,13 @@
+@@ -13403,13 +14092,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -8468,7 +7203,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13417,17 +14107,17 @@
+@@ -13418,17 +14107,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -8490,7 +7225,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13446,7 +14136,7 @@
+@@ -13447,7 +14136,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8499,7 +7234,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13467,27 +14157,14 @@
+@@ -13468,27 +14157,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -8529,7 +7264,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13500,36 +14177,33 @@
+@@ -13501,36 +14177,33 @@
;;
solaris*)
case $cc_basename in
@@ -8578,7 +7313,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13537,9 +14211,9 @@
+@@ -13538,9 +14211,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -8590,7 +7325,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13549,9 +14223,9 @@
+@@ -13550,9 +14223,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -8602,7 +7337,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13560,9 +14234,9 @@
+@@ -13561,9 +14234,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -8614,7 +7349,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13575,12 +14249,63 @@
+@@ -13576,12 +14249,63 @@
;;
esac
;;
@@ -8680,18 +7415,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13607,6 +14332,10 @@
- GCC_CXX="$GXX"
- LD_CXX="$LD"
-
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-
- cat > conftest.$ac_ext <<EOF
- class Foo
-@@ -13633,7 +14362,7 @@
+@@ -13638,7 +14362,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -8700,7 +7424,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13673,7 +14402,7 @@
+@@ -13678,7 +14402,7 @@
fi
;;
@@ -8709,7 +7433,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13709,6 +14438,29 @@
+@@ -13714,6 +14438,29 @@
$rm -f confest.$objext
@@ -8739,7 +7463,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13756,6 +14508,10 @@
+@@ -13761,6 +14508,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -8750,7 +7474,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13764,7 +14520,7 @@
+@@ -13769,7 +14520,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8759,7 +7483,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13789,18 +14545,28 @@
+@@ -13794,18 +14545,28 @@
;;
chorus*)
case $cc_basename in
@@ -8791,7 +7515,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13808,22 +14574,22 @@
+@@ -13813,22 +14574,22 @@
;;
esac
;;
@@ -8820,7 +7544,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13836,9 +14602,13 @@
+@@ -13841,9 +14602,13 @@
;;
esac
;;
@@ -8835,7 +7559,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13847,20 +14617,26 @@
+@@ -13852,20 +14617,26 @@
;;
esac
;;
@@ -8866,7 +7590,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13877,25 +14653,25 @@
+@@ -13882,25 +14653,25 @@
;;
mvs*)
case $cc_basename in
@@ -8897,7 +7621,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13909,24 +14685,15 @@
+@@ -13914,24 +14685,15 @@
;;
psos*)
;;
@@ -8924,7 +7648,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13936,12 +14703,12 @@
+@@ -13941,12 +14703,12 @@
;;
sunos4*)
case $cc_basename in
@@ -8939,7 +7663,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13951,7 +14718,7 @@
+@@ -13956,7 +14718,7 @@
;;
tandem*)
case $cc_basename in
@@ -8948,7 +7672,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13959,7 +14726,14 @@
+@@ -13964,7 +14726,14 @@
;;
esac
;;
@@ -8964,7 +7688,7 @@
;;
vxworks*)
;;
-@@ -13992,18 +14766,20 @@
+@@ -13997,18 +14766,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8972,12 +7696,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13998: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14003: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14002: \$? = $ac_status" >&5
+- echo "$as_me:14007: \$? = $ac_status" >&5
+ echo "$as_me:14776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -8990,7 +7714,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -14024,7 +14800,7 @@
+@@ -14029,7 +14800,7 @@
fi
fi
@@ -8999,7 +7723,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14034,6 +14810,48 @@
+@@ -14039,6 +14810,48 @@
;;
esac
@@ -9048,7 +7772,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-@@ -14046,38 +14864,36 @@
+@@ -14051,38 +14864,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -9069,12 +7793,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14065: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14070: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14876: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14069: \$? = $ac_status" >&5
+- echo "$as_me:14074: \$? = $ac_status" >&5
+ echo "$as_me:14880: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -9099,7 +7823,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14127,7 +14943,10 @@
+@@ -14132,7 +14943,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -9111,7 +7835,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14138,11 +14957,6 @@
+@@ -14143,11 +14957,6 @@
echo "${ECHO_T}$ld_shlibs_CXX" >&6
test "$ld_shlibs_CXX" = no && can_build_shared=no
@@ -9123,7 +7847,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14175,6 +14989,7 @@
+@@ -14180,6 +14989,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -9131,7 +7855,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14210,7 +15025,7 @@
+@@ -14215,7 +15025,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9140,7 +7864,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14220,7 +15035,20 @@
+@@ -14225,7 +15035,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9162,7 +7886,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14285,7 +15113,7 @@
+@@ -14290,7 +15113,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9171,7 +7895,7 @@
;;
beos*)
-@@ -14294,7 +15122,7 @@
+@@ -14299,7 +15122,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9180,7 +7904,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14310,7 +15138,7 @@
+@@ -14315,7 +15138,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9189,7 +7913,7 @@
need_version=no
need_lib_prefix=no
-@@ -14322,7 +15150,8 @@
+@@ -14327,7 +15150,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9199,7 +7923,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14352,7 +15181,7 @@
+@@ -14357,7 +15181,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9208,7 +7932,7 @@
;;
esac
;;
-@@ -14375,7 +15204,7 @@
+@@ -14380,7 +15204,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9217,7 +7941,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14398,20 +15227,17 @@
+@@ -14403,20 +15227,17 @@
dynamic_linker=no
;;
@@ -9249,7 +7973,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14429,14 +15255,19 @@
+@@ -14434,14 +15255,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9271,7 +7995,7 @@
esac
;;
-@@ -14456,9 +15287,9 @@
+@@ -14461,9 +15287,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9283,7 +8007,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14473,7 +15304,7 @@
+@@ -14478,7 +15304,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9292,7 +8016,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14484,7 +15315,7 @@
+@@ -14489,7 +15315,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9301,7 +8025,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14496,6 +15327,18 @@
+@@ -14501,6 +15327,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -9320,7 +8044,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14539,29 +15382,26 @@
+@@ -14544,29 +15382,26 @@
;;
# This must be Linux ELF.
@@ -9357,7 +8081,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14571,6 +15411,18 @@
+@@ -14576,6 +15411,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9376,7 +8100,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14580,7 +15432,7 @@
+@@ -14585,7 +15432,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9385,7 +8109,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14608,8 +15460,13 @@
+@@ -14613,8 +15460,13 @@
openbsd*)
version_type=sunos
@@ -9400,7 +8124,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14629,7 +15486,7 @@
+@@ -14634,7 +15486,7 @@
os2*)
libname_spec='$name'
@@ -9409,7 +8133,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14647,13 +15504,6 @@
+@@ -14652,13 +15504,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -9423,7 +8147,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14679,7 +15529,7 @@
+@@ -14684,7 +15529,7 @@
need_version=yes
;;
@@ -9432,7 +8156,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14712,6 +15562,29 @@
+@@ -14717,6 +15562,29 @@
fi
;;
@@ -9462,7 +8186,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14727,12 +15600,17 @@
+@@ -14732,12 +15600,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -9482,7 +8206,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14764,986 +15642,161 @@
+@@ -14769,970 +15642,152 @@
enable_fast_install=needless
fi
@@ -9539,7 +8263,7 @@
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
+-
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -9555,6 +8279,47 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
@@ -9613,47 +8378,17 @@
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_dl_dlopen=yes
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ case $var in
+ old_archive_cmds_CXX | \
+ old_archive_from_new_cmds_CXX | \
@@ -9676,35 +8411,22 @@
+ esac
+ done
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+ case $lt_echo in
+ *'\$0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ ;;
+ esac
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
+-fi
+cfgfile="$ofile"
--fi
+- ;;
+ cat <<__EOF__ >> "$cfgfile"
+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-- ;;
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
@@ -9720,28 +8442,27 @@
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+
+-#undef shl_load
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
--#undef shl_load
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -9761,8 +8482,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
-int
-main ()
@@ -9781,8 +8502,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -9798,8 +8518,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-ac_cv_func_shl_load=no
-fi
@@ -9824,10 +8544,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9853,8 +8571,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -9870,10 +8587,10 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
-ac_cv_lib_dld_shl_load=no
-fi
@@ -9900,29 +8617,31 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+
+-#undef dlopen
+# A C compiler.
+LTCC=$lt_LTCC
--#undef dlopen
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -9942,8 +8661,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
@@ -9962,8 +8681,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -9979,8 +8697,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-ac_cv_func_dlopen=no
-fi
@@ -10005,8 +8723,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10032,8 +8750,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -10049,8 +8766,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-ac_cv_lib_dl_dlopen=no
-fi
@@ -10101,8 +8818,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -10168,8 +8884,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -10244,7 +8959,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15401 "configure"
+-#line 15399 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -10342,7 +9057,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15499 "configure"
+-#line 15497 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -10581,13 +9296,12 @@
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# The linker used to build libraries.
++LD=$lt_LD_CXX
- # A BSD-compatible nm program.
+ # Whether we need hard or soft links.
+ LN_S=$lt_LN_S
+@@ -15741,7 +15796,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -10596,7 +9310,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15774,7 +15827,7 @@
+@@ -15772,7 +15827,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -10605,7 +9319,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15789,7 +15842,7 @@
+@@ -15787,7 +15842,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -10614,7 +9328,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15991,7 +16044,10 @@
+@@ -15989,7 +16044,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -10626,7 +9340,7 @@
fi
-@@ -16063,16 +16119,42 @@
+@@ -16061,16 +16119,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -10670,7 +9384,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16085,7 +16167,7 @@
+@@ -16083,7 +16167,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -10679,7 +9393,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16093,8 +16175,10 @@
+@@ -16091,8 +16175,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -10692,7 +9406,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16107,8 +16191,6 @@
+@@ -16105,8 +16191,6 @@
echo "$as_me:$LINENO: result: $enable_static" >&5
echo "${ECHO_T}$enable_static" >&6
@@ -10701,7 +9415,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16155,6 +16237,11 @@
+@@ -16153,6 +16237,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -10713,7 +9427,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16171,7 +16258,7 @@
+@@ -16169,7 +16258,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -10722,7 +9436,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16197,6 +16284,16 @@
+@@ -16195,6 +16284,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -10739,7 +9453,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16208,7 +16305,7 @@
+@@ -16206,7 +16305,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -10748,7 +9462,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16231,13 +16328,20 @@
+@@ -16229,13 +16328,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10771,7 +9485,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16252,15 +16356,15 @@
+@@ -16250,15 +16356,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -10793,7 +9507,7 @@
;;
sunos4*)
-@@ -16269,7 +16373,7 @@
+@@ -16267,7 +16373,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10802,34 +9516,25 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16282,12 +16386,23 @@
+@@ -16280,6 +16386,17 @@
fi
;;
-- uts4*)
-- lt_prog_compiler_pic_F77='-pic'
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
-- *)
++ lt_prog_compiler_static_F77='-Bstatic'
++ ;;
++
+ unicos*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
+
-+ uts4*)
-+ lt_prog_compiler_pic_F77='-pic'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+
-+ *)
- lt_prog_compiler_can_build_shared_F77=no
- ;;
- esac
-@@ -16316,18 +16431,20 @@
+ uts4*)
+ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16314,18 +16431,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -10837,12 +9542,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16322: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16320: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16437: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16326: \$? = $ac_status" >&5
+- echo "$as_me:16324: \$? = $ac_status" >&5
+ echo "$as_me:16441: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -10855,7 +9560,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16348,7 +16465,7 @@
+@@ -16346,7 +16465,7 @@
fi
fi
@@ -10864,10 +9569,13 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16358,6 +16475,48 @@
+@@ -16356,50 +16475,90 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -10875,8 +9583,10 @@
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_cv_prog_compiler_c_o_F77=no
+- $rm -r conftest 2>/dev/null
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -10910,10 +9620,15 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16370,38 +16529,36 @@
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_prog_compiler_c_o_F77=no
++ $rm -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -10934,12 +9649,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16387: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16541: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16393: \$? = $ac_status" >&5
+- echo "$as_me:16391: \$? = $ac_status" >&5
+ echo "$as_me:16545: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -10964,7 +9679,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16472,6 +16629,16 @@
+@@ -16470,6 +16629,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -10981,7 +9696,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16482,6 +16649,10 @@
+@@ -16480,6 +16649,10 @@
with_gnu_ld=no
fi
;;
@@ -10992,7 +9707,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16492,6 +16663,27 @@
+@@ -16490,6 +16663,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11020,7 +9735,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16529,7 +16721,7 @@
+@@ -16527,7 +16721,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -11029,7 +9744,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16539,13 +16731,13 @@
+@@ -16537,13 +16731,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -11046,7 +9761,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16554,23 +16746,70 @@
+@@ -16552,23 +16746,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -11123,7 +9838,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16584,13 +16823,40 @@
+@@ -16582,13 +16823,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11166,7 +9881,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16600,24 +16866,19 @@
+@@ -16598,24 +16866,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11198,7 +9913,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16629,7 +16890,7 @@
+@@ -16627,7 +16890,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -11207,7 +9922,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16651,9 +16912,21 @@
+@@ -16649,9 +16912,21 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -11231,7 +9946,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16670,7 +16943,7 @@
+@@ -16668,7 +16943,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -11240,7 +9955,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16689,8 +16962,12 @@
+@@ -16687,8 +16962,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -11253,7 +9968,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16698,22 +16975,23 @@
+@@ -16696,22 +16975,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -11284,17 +9999,7 @@
program main
end
-@@ -16727,8 +17005,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16755,14 +17032,13 @@
+@@ -16752,14 +17032,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11312,17 +10017,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16779,8 +17055,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -16812,13 +17087,11 @@
+@@ -16808,13 +17087,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -11339,7 +10034,7 @@
fi
fi
;;
-@@ -16831,7 +17104,7 @@
+@@ -16827,7 +17104,7 @@
ld_shlibs_F77=no
;;
@@ -11348,7 +10043,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16841,68 +17114,68 @@
+@@ -16837,68 +17114,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -11461,7 +10156,7 @@
fi
;;
-@@ -16936,8 +17209,8 @@
+@@ -16932,8 +17209,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -11472,7 +10167,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16945,7 +17218,7 @@
+@@ -16941,7 +17218,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -11481,7 +10176,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16959,47 +17232,62 @@
+@@ -16955,47 +17232,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -11568,7 +10263,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17013,7 +17301,7 @@
+@@ -17009,7 +17301,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -11577,7 +10272,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17023,7 +17311,7 @@
+@@ -17019,7 +17311,7 @@
link_all_deplibs_F77=yes
;;
@@ -11586,7 +10281,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17046,7 +17334,8 @@
+@@ -17042,7 +17334,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -11596,7 +10291,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17056,7 +17345,7 @@
+@@ -17052,7 +17345,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -11605,7 +10300,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17067,14 +17356,14 @@
+@@ -17063,14 +17356,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -11622,7 +10317,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17086,13 +17375,13 @@
+@@ -17082,13 +17375,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -11638,7 +10333,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17100,21 +17389,15 @@
+@@ -17096,21 +17389,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -11664,7 +10359,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17123,8 +17406,18 @@
+@@ -17119,8 +17406,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -11685,7 +10380,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17133,7 +17426,7 @@
+@@ -17129,7 +17426,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -11694,7 +10389,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17181,36 +17474,45 @@
+@@ -17177,36 +17474,45 @@
fi
;;
@@ -11761,7 +10456,7 @@
;;
uts4*)
-@@ -17229,11 +17531,6 @@
+@@ -17225,11 +17531,6 @@
echo "${ECHO_T}$ld_shlibs_F77" >&6
test "$ld_shlibs_F77" = no && can_build_shared=no
@@ -11773,7 +10468,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17266,6 +17563,7 @@
+@@ -17262,6 +17563,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -11781,7 +10476,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17301,7 +17599,7 @@
+@@ -17297,7 +17599,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -11790,7 +10485,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17311,7 +17609,20 @@
+@@ -17307,7 +17609,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -11812,7 +10507,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17376,7 +17687,7 @@
+@@ -17372,7 +17687,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11821,7 +10516,7 @@
;;
beos*)
-@@ -17385,7 +17696,7 @@
+@@ -17381,7 +17696,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -11830,7 +10525,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17401,7 +17712,7 @@
+@@ -17397,7 +17712,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -11839,7 +10534,7 @@
need_version=no
need_lib_prefix=no
-@@ -17413,7 +17724,8 @@
+@@ -17409,7 +17724,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -11849,7 +10544,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17443,7 +17755,7 @@
+@@ -17439,7 +17755,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11858,7 +10553,7 @@
;;
esac
;;
-@@ -17466,7 +17778,7 @@
+@@ -17462,7 +17778,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -11867,7 +10562,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17489,20 +17801,17 @@
+@@ -17485,20 +17801,17 @@
dynamic_linker=no
;;
@@ -11899,7 +10594,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17520,14 +17829,19 @@
+@@ -17516,14 +17829,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -11921,7 +10616,7 @@
esac
;;
-@@ -17547,9 +17861,9 @@
+@@ -17543,9 +17861,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -11933,7 +10628,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17564,7 +17878,7 @@
+@@ -17560,7 +17878,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -11942,7 +10637,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17575,7 +17889,7 @@
+@@ -17571,7 +17889,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -11951,7 +10646,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17587,6 +17901,18 @@
+@@ -17583,6 +17901,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -11970,7 +10665,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17630,29 +17956,26 @@
+@@ -17626,29 +17956,26 @@
;;
# This must be Linux ELF.
@@ -12007,7 +10702,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17662,6 +17985,18 @@
+@@ -17658,6 +17985,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -12026,7 +10721,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17671,7 +18006,7 @@
+@@ -17667,7 +18006,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -12035,7 +10730,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17699,8 +18034,13 @@
+@@ -17695,8 +18034,13 @@
openbsd*)
version_type=sunos
@@ -12050,7 +10745,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17720,7 +18060,7 @@
+@@ -17716,7 +18060,7 @@
os2*)
libname_spec='$name'
@@ -12059,7 +10754,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17738,13 +18078,6 @@
+@@ -17734,13 +18078,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -12073,7 +10768,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17770,7 +18103,7 @@
+@@ -17766,7 +18103,7 @@
need_version=yes
;;
@@ -12082,7 +10777,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17803,6 +18136,29 @@
+@@ -17799,6 +18136,29 @@
fi
;;
@@ -12112,7 +10807,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17818,12 +18174,17 @@
+@@ -17814,12 +18174,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -12132,7 +10827,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17855,36 +18216,6 @@
+@@ -17851,36 +18216,6 @@
enable_fast_install=needless
fi
@@ -12169,7 +10864,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17899,7 +18230,8 @@
+@@ -17895,7 +18230,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -12179,7 +10874,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17999,6 +18331,12 @@
+@@ -17995,6 +18331,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -12192,7 +10887,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18010,6 +18348,9 @@
+@@ -18006,6 +18348,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -12202,7 +10897,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18029,7 +18370,7 @@
+@@ -18025,7 +18370,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -12211,7 +10906,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18060,7 +18401,7 @@
+@@ -18056,7 +18401,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -12220,7 +10915,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18075,7 +18416,7 @@
+@@ -18071,7 +18416,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -12229,7 +10924,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18277,7 +18618,10 @@
+@@ -18273,7 +18618,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -12241,7 +10936,7 @@
fi
-@@ -18310,26 +18654,59 @@
+@@ -18306,26 +18654,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -12295,13 +10990,9 @@
+old_archive_cmds_GCJ=$old_archive_cmds
+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-
- lt_prog_compiler_no_builtin_flag_GCJ=
-
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
@@ -18352,18 +18729,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
@@ -12902,17 +11593,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19006,8 +19581,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19034,14 +19608,13 @@
+@@ -19033,14 +19608,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12930,17 +11611,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19068,8 +19641,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -19101,13 +19673,11 @@
+@@ -19099,13 +19673,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12957,7 +11628,7 @@
fi
fi
;;
-@@ -19120,7 +19690,7 @@
+@@ -19118,7 +19690,7 @@
ld_shlibs_GCJ=no
;;
@@ -12966,7 +11637,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19130,68 +19700,68 @@
+@@ -19128,68 +19700,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -13079,7 +11750,7 @@
fi
;;
-@@ -19225,8 +19795,8 @@
+@@ -19223,8 +19795,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -13090,7 +11761,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19234,7 +19804,7 @@
+@@ -19232,7 +19804,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -13099,7 +11770,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19248,47 +19818,62 @@
+@@ -19246,47 +19818,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -13186,7 +11857,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19302,7 +19887,7 @@
+@@ -19300,7 +19887,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -13195,7 +11866,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19312,7 +19897,7 @@
+@@ -19310,7 +19897,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -13204,7 +11875,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19335,7 +19920,8 @@
+@@ -19333,7 +19920,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -13214,7 +11885,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19345,7 +19931,7 @@
+@@ -19343,7 +19931,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -13223,7 +11894,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19356,14 +19942,14 @@
+@@ -19354,14 +19942,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -13240,7 +11911,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19375,13 +19961,13 @@
+@@ -19373,13 +19961,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -13256,7 +11927,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19389,21 +19975,15 @@
+@@ -19387,21 +19975,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -13282,7 +11953,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19412,8 +19992,18 @@
+@@ -19410,8 +19992,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13303,7 +11974,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19422,7 +20012,7 @@
+@@ -19420,7 +20012,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -13312,7 +11983,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19470,36 +20060,45 @@
+@@ -19468,36 +20060,45 @@
fi
;;
@@ -13379,7 +12050,7 @@
;;
uts4*)
-@@ -19518,11 +20117,6 @@
+@@ -19516,11 +20117,6 @@
echo "${ECHO_T}$ld_shlibs_GCJ" >&6
test "$ld_shlibs_GCJ" = no && can_build_shared=no
@@ -13391,7 +12062,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19555,6 +20149,7 @@
+@@ -19553,6 +20149,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -13399,7 +12070,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19590,7 +20185,7 @@
+@@ -19588,7 +20185,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -13408,7 +12079,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19600,7 +20195,20 @@
+@@ -19598,7 +20195,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13430,7 +12101,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19665,7 +20273,7 @@
+@@ -19663,7 +20273,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13439,7 +12110,7 @@
;;
beos*)
-@@ -19674,7 +20282,7 @@
+@@ -19672,7 +20282,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13448,7 +12119,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19690,7 +20298,7 @@
+@@ -19688,7 +20298,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13457,7 +12128,7 @@
need_version=no
need_lib_prefix=no
-@@ -19702,7 +20310,8 @@
+@@ -19700,7 +20310,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13467,7 +12138,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19732,7 +20341,7 @@
+@@ -19730,7 +20341,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13476,7 +12147,7 @@
;;
esac
;;
-@@ -19755,7 +20364,7 @@
+@@ -19753,7 +20364,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13485,7 +12156,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19778,20 +20387,17 @@
+@@ -19776,20 +20387,17 @@
dynamic_linker=no
;;
@@ -13517,7 +12188,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19809,14 +20415,19 @@
+@@ -19807,14 +20415,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13539,7 +12210,7 @@
esac
;;
-@@ -19836,9 +20447,9 @@
+@@ -19834,1140 +20447,359 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13551,28 +12222,36 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19853,7 +20464,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- if test "X$HPUX_IA64_MODE" = X32; then
+- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- else
+- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- fi
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- hppa*64*)
- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19864,7 +20475,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- *)
- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19872,1111 +20483,323 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=SHLIB_PATH
+- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
+- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
@@ -13939,8 +12618,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14043,8 +12721,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14109,8 +12786,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14203,8 +12879,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14269,8 +12944,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14336,8 +13010,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14403,8 +13076,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -14432,6 +13104,34 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++ else
++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ hppa*64*)
++ shrext_cmds='.sl'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ *)
++ shrext_cmds='.sl'
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=SHLIB_PATH
++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
++ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+ ;;
@@ -14625,7 +13325,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20781 "configure"
+-#line 20772 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -14813,7 +13513,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20879 "configure"
+-#line 20870 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -14967,7 +13667,7 @@
fi
-@@ -20993,7 +20816,8 @@
+@@ -20984,7 +20816,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -14977,7 +13677,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21093,6 +20917,12 @@
+@@ -21084,6 +20917,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14990,7 +13690,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21104,6 +20934,9 @@
+@@ -21095,6 +20934,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -15000,7 +13700,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21123,7 +20956,7 @@
+@@ -21114,7 +20956,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -15009,7 +13709,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21154,7 +20987,7 @@
+@@ -21145,7 +20987,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -15018,7 +13718,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21169,7 +21002,7 @@
+@@ -21160,7 +21002,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -15027,7 +13727,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21371,7 +21204,10 @@
+@@ -21362,7 +21204,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -15039,7 +13739,7 @@
fi
-@@ -21410,15 +21246,42 @@
+@@ -21401,15 +21246,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -15082,7 +13782,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21434,7 +21297,8 @@
+@@ -21425,7 +21297,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -15092,7 +13792,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21534,6 +21398,12 @@
+@@ -21525,6 +21398,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -15105,7 +13805,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21545,6 +21415,9 @@
+@@ -21536,6 +21415,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -15115,7 +13815,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21564,7 +21437,7 @@
+@@ -21555,7 +21437,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -15124,7 +13824,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21595,7 +21468,7 @@
+@@ -21586,7 +21468,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -15133,7 +13833,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21610,7 +21483,7 @@
+@@ -21601,7 +21483,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -15142,7 +13842,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21812,7 +21685,10 @@
+@@ -21803,7 +21685,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -15154,7 +13854,7 @@
fi
-@@ -21859,7 +21735,7 @@
+@@ -21850,7 +21735,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -15163,17 +13863,7 @@
# Prevent multiple expansion
-@@ -22184,8 +22060,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22259,9 +22134,6 @@
+@@ -22249,9 +22134,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15183,27 +13873,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22295,8 +22167,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22400,8 +22271,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22480,9 +22350,6 @@
+@@ -22468,9 +22350,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15213,247 +13883,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22515,8 +22382,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22619,8 +22485,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22710,8 +22575,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22772,8 +22636,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22841,8 +22704,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -22908,8 +22770,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23002,8 +22863,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23081,8 +22941,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23166,8 +23025,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23235,8 +23093,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23331,8 +23188,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23396,8 +23252,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23492,8 +23347,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23557,8 +23411,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23654,8 +23507,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23719,8 +23571,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23817,8 +23668,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23883,8 +23733,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -23952,8 +23801,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24104,8 +23952,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24260,8 +24107,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24326,8 +24172,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24474,8 +24319,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24630,8 +24474,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24687,9 +24530,6 @@
+@@ -24651,9 +24530,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15463,838 +13893,70 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24723,8 +24563,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24828,8 +24667,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -24929,8 +24767,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25004,8 +24841,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25068,8 +24904,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25131,8 +24966,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25172,8 +25006,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25229,8 +25062,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25270,8 +25102,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25335,8 +25166,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25367,10 +25197,8 @@
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25481,8 +25309,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25544,8 +25371,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25585,8 +25411,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25642,8 +25467,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25683,8 +25507,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25748,8 +25571,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25780,10 +25602,8 @@
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -25894,8 +25714,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25957,8 +25776,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -25998,8 +25816,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26055,8 +25872,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26096,8 +25912,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26161,8 +25976,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26193,10 +26007,8 @@
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26307,8 +26119,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26370,8 +26181,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26411,8 +26221,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26468,8 +26277,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26509,8 +26317,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26574,8 +26381,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26606,10 +26412,8 @@
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -26728,8 +26532,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26800,8 +26603,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26871,8 +26673,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26934,8 +26735,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -26975,8 +26775,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27032,8 +26831,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27073,8 +26871,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27138,8 +26935,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27170,10 +26966,8 @@
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -27285,8 +27079,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27348,8 +27141,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27389,8 +27181,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27446,8 +27237,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27487,8 +27277,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27552,8 +27341,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27584,10 +27372,8 @@
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -27698,8 +27484,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27780,8 +27565,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -27881,8 +27665,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28062,8 +27845,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28172,8 +27954,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28397,8 +28178,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28621,8 +28401,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28698,8 +28477,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28841,8 +28619,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28917,8 +28694,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -28978,8 +28754,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29062,8 +28837,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29156,8 +28930,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29331,8 +29104,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29430,8 +29202,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29518,8 +29289,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29596,8 +29366,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -29650,7 +29419,7 @@
+@@ -29543,7 +29419,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29653: $i/$j" >&5
+- echo "configure: 29546: $i/$j" >&5
+ echo "configure: 29422: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29948,7 +29717,7 @@
+@@ -29841,7 +29717,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29951: $i/$j" >&5
+- echo "configure: 29844: $i/$j" >&5
+ echo "configure: 29720: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30625,8 +30394,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -30785,7 +30553,7 @@
+@@ -30677,7 +30553,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30788: $i/$j" >&5
+- echo "configure: 30680: $i/$j" >&5
+ echo "configure: 30556: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30815,7 +30583,7 @@
+@@ -30707,7 +30583,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30818: $i/$j" >&5
+- echo "configure: 30710: $i/$j" >&5
+ echo "configure: 30586: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30833,7 +30601,7 @@
+@@ -30725,7 +30601,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30836: $i/$j" >&5
+- echo "configure: 30728: $i/$j" >&5
+ echo "configure: 30604: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32356,7 +32124,7 @@
+@@ -32248,7 +32124,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32359: $i/$j" >&5
+- echo "configure: 32251: $i/$j" >&5
+ echo "configure: 32127: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32616,8 +32384,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -32712,8 +32479,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -32806,8 +32572,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -32880,7 +32645,7 @@
+@@ -32769,7 +32645,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32883: $i/$j" >&5
+- echo "configure: 32772: $i/$j" >&5
+ echo "configure: 32648: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -33179,8 +32944,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -33275,8 +33039,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -33369,8 +33132,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -34062,8 +33824,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -34242,8 +34003,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -34321,8 +34081,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -34835,6 +34594,13 @@
+@@ -34718,6 +34594,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -16308,578 +13970,30 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -35598,14 +35364,20 @@
- s, at AUTOMAKE@,$AUTOMAKE,;t t
- s, at AUTOHEADER@,$AUTOHEADER,;t t
- s, at MAKEINFO@,$MAKEINFO,;t t
--s, at AMTAR@,$AMTAR,;t t
- s, at install_sh@,$install_sh,;t t
- s, at STRIP@,$STRIP,;t t
- s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s, at mkdir_p@,$mkdir_p,;t t
- s, at AWK@,$AWK,;t t
- s, at SET_MAKE@,$SET_MAKE,;t t
- s, at am__leading_dot@,$am__leading_dot,;t t
-+s, at AMTAR@,$AMTAR,;t t
-+s, at am__tar@,$am__tar,;t t
-+s, at am__untar@,$am__untar,;t t
+@@ -35492,6 +35375,9 @@
+ s, at AMTAR@,$AMTAR,;t t
+ s, at am__tar@,$am__tar,;t t
+ s, at am__untar@,$am__untar,;t t
+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s, at MAINT@,$MAINT,;t t
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -36001,11 +35773,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -36044,6 +35811,12 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-@@ -36457,27 +36230,21 @@
- else
- continue
- fi
-- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-- # Extract the definition of DEP_FILES from the Makefile without
-- # running `make'.
-- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n -e '/^U = / s///p' < "$mf"`
-- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-- # We invoke sed twice because it is the simplest approach to
-- # changing $(DEPDIR) to its actual value in the expansion.
-- for file in `sed -n -e '
-- /^DEP_FILES = .*\\\\$/ {
-- s/^DEP_FILES = //
-- :loop
-- s/\\\\$//
-- p
-- n
-- /\\\\$/ b loop
-- p
-- }
-- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
--- configure.in
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kipi-plugins-0.1.1, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kipi-plugins-0.1.2, "3.5.3") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +204,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -235,6 +267,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +340,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -328,46 +363,58 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--
- KDE_LANG = en
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
- SUBDIRS =. kipi-plugins da_kipi-plugins de_kipi-plugins es_kipi-plugins et_kipi-plugins it_kipi-plugins nl_kipi-plugins pt_kipi-plugins pt_BR_kipi-plugins ru_kipi-plugins sv_kipi-plugins
--subdir = doc
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-+#>- @for dep in $?; do \
-+#>- case '$(am__configure_deps)' in \
-+#>- *$$dep*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
- #>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu doc/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign doc/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/Makefile
-+ $(AUTOMAKE) --foreign doc/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -386,7 +433,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 \
-@@ -398,7 +451,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; \
-@@ -406,7 +459,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)' ;; \
-@@ -427,7 +486,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 \
-@@ -438,14 +497,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -454,19 +505,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -476,10 +530,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -502,12 +557,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -521,7 +570,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -536,15 +585,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -554,7 +605,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -574,7 +624,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -596,6 +646,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -630,37 +682,42 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in
-+KDE_DIST=Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign doc/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
-
-
--- doc/da_kipi-plugins/Makefile.in
+++ doc/da_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/da_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -16889,239 +14003,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = da
- KDE_DOCS = kipi-plugins
--subdir = doc/da_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/da_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=sendimages.docbook convertimages.docbook galleryexport.docbook recompressimages.docbook effectimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook timeadjust.docbook calendar.docbook borderimages.docbook index.docbook imagesgallery.docbook wallpaper.docbook kameraklient.docbook mpeg_encode_dialog.png jpeglossless.docbook renameimages.docbook printwizard.docbook slideshow.docbook resizeimages.docbook
-+KDE_DIST=sendimages.docbook convertimages.docbook galleryexport.docbook recompressimages.docbook effectimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook timeadjust.docbook calendar.docbook borderimages.docbook index.docbook imagesgallery.docbook wallpaper.docbook kameraklient.docbook mpeg_encode_dialog.png jpeglossless.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook resizeimages.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook timeadjust.docbook calendar.docbook acquireimages.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook mpeg_encode_dialog.png resizeimages.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/da_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/da_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/da_kipi-plugins/Makefile.in
--- doc/de_kipi-plugins/Makefile.in
+++ doc/de_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/de_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -17131,239 +14072,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = de
- KDE_DOCS = kipi-plugins
--subdir = doc/de_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/de_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook raw_converter_single.png imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook imagegallery_progress.png slideshow.docbook
-+KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook raw_converter_single.png imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png Makefile.am printwizard.docbook imagegallery_progress.png slideshow.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook slideshow.png convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png flickrexportuploading.png sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook flickrexportauthenticated.png raw_converter_batch.png imagesgallery.docbook flickrexportcontinue.png imagegallery_thumbsettings.png wallpaper.docbook mpegencoder.docbook sendimages_imageselection.png renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/de_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/de_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/de_kipi-plugins/Makefile.in
--- doc/es_kipi-plugins/Makefile.in
+++ doc/es_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/es_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -17373,239 +14141,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = es
- KDE_DOCS = kipi-plugins
--subdir = doc/es_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/es_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook slideshow.docbook imagegallery_progress.png
-+KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png Makefile.am printwizard.docbook slideshow.docbook imagegallery_progress.png
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook slideshow.png convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png flickrexportuploading.png sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook flickrexportauthenticated.png raw_converter_batch.png imagesgallery.docbook flickrexportcontinue.png imagegallery_thumbsettings.png wallpaper.docbook mpegencoder.docbook sendimages_imageselection.png renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/es_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/es_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/es_kipi-plugins/Makefile.in
--- doc/et_kipi-plugins/Makefile.in
+++ doc/et_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/et_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -17615,239 +14210,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = et
- KDE_DOCS = kipi-plugins
--subdir = doc/et_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/et_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook
-+KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook timeadjust.docbook calendar.docbook acquireimages.docbook filterimages.docbook printwizard.docbook jpeglossless.docbook imagesgallery.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/et_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/et_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/et_kipi-plugins/Makefile.in
--- doc/it_kipi-plugins/Makefile.in
+++ doc/it_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/it_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -17857,239 +14279,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = it
- KDE_DOCS = kipi-plugins
--subdir = doc/it_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/it_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook
-+KDE_DIST=galleryexport.docbook effectimages.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook recompressimages.docbook kameraklient.docbook index.docbook timeadjust.docbook calendar.docbook acquireimages.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/it_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/it_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/it_kipi-plugins/Makefile.in
--- doc/kipi-plugins/Makefile.in
+++ doc/kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/kipi-plugins
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -18099,242 +14348,135 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -328,30 +347,55 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--
- KDE_LANG = en
- KDE_DOCS = AUTO
--subdir = doc/kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -368,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile
++ $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/kipi-plugins/Makefile.in
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -389,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -407,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -430,7 +467,7 @@
- clean-generic:
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -204,6 +204,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAGICK_CONFIG = @MAGICK_CONFIG@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -370,7 +373,7 @@
+ all: docs-am all-recursive
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ .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*) \
+@@ -379,9 +382,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu doc/Makefile
++#>- $(AUTOMAKE) --foreign doc/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -391,9 +394,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/Makefile
++ $(AUTOMAKE) --foreign doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -408,9 +411,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -451,6 +488,8 @@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- dvi-am:
+ mostlyclean-libtool:
+@@ -712,9 +715,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/Makefile
++ $(AUTOMAKE) --foreign doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
-+html: html-am
-+
- info: info-am
- info-am:
-@@ -487,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -500,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook slideshow.docbook imagegallery_progress.png
-+KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png flickrexportauthenticated.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook slideshow.png flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook Makefile.am slideshow.docbook imagegallery_progress.png
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook slideshow.png convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png README sendimages_progress.png timeadjust.docbook printwizard.docbook imagesgallery.docbook sendimages.docbook flickrexportauthenticated.png flickrexportuploading.png flickrexportcontinue.png raw_converter_batch.png wallpaper.docbook imagegallery_thumbsettings.png mpegencoder.docbook renameimages.docbook sendimages_imageselection.png
-@@ -547,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign doc/kipi-plugins/Makefile
- cd $(top_srcdir) && perl admin/am_edit doc/kipi-plugins/Makefile.in
-
-
--- doc/nl_kipi-plugins/Makefile.in
+++ doc/nl_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/nl_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -18344,239 +14486,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = nl
- KDE_DOCS = kipi-plugins
--subdir = doc/nl_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/nl_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png gammacalibration.docbook timeadjust.docbook slideshow_dialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook renameimages.docbook sendimages_progress.png printwizard.docbook slideshow.docbook
-+KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png gammacalibration.docbook timeadjust.docbook slideshow_dialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook renameimages.docbook sendimages_progress.png Makefile.am printwizard.docbook slideshow.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) convertimages.docbook borderimages.docbook colorimages.docbook kameraklient.docbook index.docbook findduplicateimages.docbook recompressimages.docbook calendar.docbook filterimages.docbook jpeglossless.docbook acquireimages.docbook rawconverter.docbook cdarchiving.docbook effectimages.docbook slideshow_dialog.png sendimages_mail.png raw_converter_single.png resizeimages.docbook gammacalibration.docbook slideshow.docbook galleryexport.docbook sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook diroperations.docbook raw_converter_batch.png imagesgallery.docbook wallpaper.docbook mpegencoder.docbook renameimages.docbook sendimages_imageselection.png
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/nl_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/nl_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/nl_kipi-plugins/Makefile.in
--- doc/pt_BR_kipi-plugins/Makefile.in
+++ doc/pt_BR_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/pt_BR_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -18586,239 +14555,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = pt_BR
- KDE_DOCS = kipi-plugins
--subdir = doc/pt_BR_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/pt_BR_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook commenteditor.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in gammacalibration.docbook timeadjust.docbook findimages.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook
-+KDE_DIST=effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook commenteditor.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in gammacalibration.docbook timeadjust.docbook findimages.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook findimages.docbook recompressimages.docbook kameraklient.docbook index.docbook commenteditor.docbook calendar.docbook timeadjust.docbook filterimages.docbook jpeglossless.docbook printwizard.docbook acquireimages.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook diroperations.docbook imagesgallery.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook gammacalibration.docbook renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/pt_BR_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/pt_BR_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/pt_BR_kipi-plugins/Makefile.in
--- doc/pt_kipi-plugins/Makefile.in
+++ doc/pt_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/pt_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -18828,239 +14624,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = pt
- KDE_DOCS = kipi-plugins
--subdir = doc/pt_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/pt_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook gammacalibration.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook printwizard.docbook slideshow.docbook
-+KDE_DIST=galleryexport.docbook effectimages.docbook diroperations.docbook rawconverter.docbook mpegencoder.docbook filterimages.docbook findduplicateimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook index.docbook imagesgallery.docbook wallpaper.docbook jpeglossless.docbook resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in flickrexport.docbook gammacalibration.docbook timeadjust.docbook borderimages.docbook kameraklient.docbook renameimages.docbook Makefile.am printwizard.docbook slideshow.docbook
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) findduplicateimages.docbook galleryexport.docbook convertimages.docbook slideshow.docbook borderimages.docbook colorimages.docbook kameraklient.docbook index.docbook recompressimages.docbook calendar.docbook timeadjust.docbook filterimages.docbook flickrexport.docbook jpeglossless.docbook printwizard.docbook acquireimages.docbook sendimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook diroperations.docbook imagesgallery.docbook resizeimages.docbook wallpaper.docbook mpegencoder.docbook gammacalibration.docbook renameimages.docbook
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/pt_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/pt_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/pt_kipi-plugins/Makefile.in
--- doc/ru_kipi-plugins/Makefile.in
+++ doc/ru_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/ru_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -19070,239 +14693,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = ru
- KDE_DOCS = kipi-plugins
--subdir = doc/ru_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/ru_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=calendar.docbook Makefile.in
-+KDE_DIST=calendar.docbook Makefile.in Makefile.am
-
- #>+ 2
- docs-am: calendar.docbook
-@@ -524,10 +564,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -571,9 +574,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/ru_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/ru_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/ru_kipi-plugins/Makefile.in
--- doc/sv_kipi-plugins/Makefile.in
+++ doc/sv_kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = doc/sv_kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +188,9 @@
+@@ -188,6 +188,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -19312,259 +14762,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +251,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +324,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,27 +349,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = sv
- KDE_DOCS = kipi-plugins
--subdir = doc/sv_kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -351,7 +354,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -360,9 +363,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +375,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/sv_kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -389,9 +392,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,12 +412,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -388,7 +427,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -406,7 +445,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -429,7 +467,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -450,6 +488,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -486,10 +526,10 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-@@ -499,7 +539,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png printwizard.docbook slideshow.docbook imagegallery_progress.png
-+KDE_DIST=galleryexport.docbook effectimages.docbook imagegallery_preview.png imagegallery_collectionselection.png rawconverter.docbook mpegencoder.docbook findduplicateimages.docbook filterimages.docbook acquireimages.docbook colorimages.docbook calendar.docbook flickrexportsignup.png flickrexportuploading.png raw_converter_batch.png index.docbook imagesgallery.docbook wallpaper.docbook sendimages_mail.png jpeglossless.docbook flickrexportcontinue.png resizeimages.docbook sendimages.docbook convertimages.docbook recompressimages.docbook cdarchiving.docbook Makefile.in raw_converter_single.png flickrexport.docbook imagegallery_thumbsettings.png acquire-savetargetpreview.png timeadjust.docbook slideshow_dialog.png imagegallery_albumsettings.png flickrexportuploaddialog.png borderimages.docbook sendimages_imageselection.png kameraklient.docbook mpeg_encode_dialog.png imagegallery_looksettings.png renameimages.docbook sendimages_progress.png acquire-screenshotpreview.png Makefile.am printwizard.docbook slideshow.docbook imagegallery_progress.png
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) imagegallery_collectionselection.png acquire-savetargetpreview.png borderimages.docbook colorimages.docbook convertimages.docbook kameraklient.docbook index.docbook imagegallery_preview.png recompressimages.docbook calendar.docbook acquire-screenshotpreview.png imagegallery_looksettings.png filterimages.docbook flickrexport.docbook jpeglossless.docbook acquireimages.docbook cdarchiving.docbook rawconverter.docbook effectimages.docbook slideshow_dialog.png raw_converter_single.png sendimages_mail.png mpeg_encode_dialog.png resizeimages.docbook imagegallery_albumsettings.png imagegallery_progress.png galleryexport.docbook findduplicateimages.docbook slideshow.docbook flickrexportuploaddialog.png flickrexportsignup.png flickrexportuploading.png sendimages_progress.png timeadjust.docbook printwizard.docbook sendimages.docbook raw_converter_batch.png imagesgallery.docbook flickrexportcontinue.png wallpaper.docbook imagegallery_thumbsettings.png mpegencoder.docbook renameimages.docbook sendimages_imageselection.png
-@@ -546,10 +586,19 @@
- cp $(srcdir)/$$file $(distdir); \
- done
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -593,9 +596,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu doc/sv_kipi-plugins/Makefile
+ $(AUTOMAKE) --foreign doc/sv_kipi-plugins/Makefile
cd $(top_srcdir) && perl admin/am_edit doc/sv_kipi-plugins/Makefile.in
---- kipi-plugins/Makefile.in
-+++ kipi-plugins/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -22,7 +22,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +38,49 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(rcdir)"
-+rcDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(rc_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = printwizard calendar mpegencoder cdarchiving \
-+ simpleviewerexport sendimages batchprocessimages wallpaper \
-+ findimages galleryexport flickrexport slideshow kameraklient \
-+ jpeglossless timeadjust acquireimages rawconverter htmlexport
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +217,9 @@
+--- kipi-plugins/acquireimages/Makefile.in
++++ kipi-plugins/acquireimages/Makefile.in
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -19574,503 +14831,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +280,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +353,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -332,70 +380,69 @@
- # Do *NOT* indent the content of the ifs, this will break the generated
- # Makefile
- @compile_SLIDESHOW_TRUE at SLIDESHOWDIR = slideshow
--
- @compile_KAMERAKLIENT_TRUE at KAMERAKLIENTDIR = kameraklient
--
- @compile_HTMLEXPORT_TRUE at HTMLEXPORTDIR = htmlexport
--
- @compile_JPEGLOSSLESS_TRUE at jpeglosslessdir = jpeglossless
--
- @compile_TIMEADJUST_TRUE at timeadjustdir = timeadjust
--
- @compile_LIBKEXIF_TRUE at JPEGLOSSLESSDIR = $(jpeglosslessdir)
- @compile_LIBKEXIF_TRUE at TIMEADJUSTDIR = $(timeadjustdir)
--
- @compile_ACQUIREIMAGES_TRUE at ACQUIREIMAGESDIR = acquireimages
--
- @compile_RAWCONVERTER_TRUE at RAWCONVERTERDIR = rawconverter
--
- SUBDIRS = printwizard calendar mpegencoder cdarchiving simpleviewerexport\
- sendimages batchprocessimages wallpaper findimages galleryexport flickrexport\
- $(SLIDESHOWDIR) $(KAMERAKLIENTDIR) $(JPEGLOSSLESSDIR) \
- $(TIMEADJUSTDIR) $(ACQUIREIMAGESDIR) $(RAWCONVERTERDIR) \
- $(HTMLEXPORTDIR)
+@@ -415,7 +418,7 @@
--
- rcdir = $(kde_datadir)/kipi
- rc_DATA = tips
--subdir = kipi-plugins
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(rc_DATA)
--
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = printwizard calendar mpegencoder cdarchiving \
-- simpleviewerexport sendimages batchprocessimages wallpaper \
-- findimages galleryexport flickrexport slideshow kameraklient \
-- jpeglossless timeadjust acquireimages rawconverter htmlexport
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
-
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ .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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -424,9 +427,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu kipi-plugins/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign kipi-plugins/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
+-#>- $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile
++#>- $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -436,9 +439,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/Makefile
-+ $(AUTOMAKE) --foreign kipi-plugins/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+- $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/acquireimages/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -453,9 +456,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
+ 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:
- -rm -f *.lo
-@@ -406,23 +453,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--rcDATA_INSTALL = $(INSTALL_DATA)
- install-rcDATA: $(rc_DATA)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(rcdir)
-+ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
- @list='$(rc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
-- $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
-+ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
- done
-
- uninstall-rcDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(rc_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
-- rm -f $(DESTDIR)$(rcdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
- done
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -432,7 +478,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 \
-@@ -444,7 +496,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; \
+@@ -793,9 +796,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -452,7 +504,13 @@
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/acquireimages/Makefile.in
- 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)' ;; \
-@@ -473,7 +531,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 \
-@@ -484,14 +542,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -500,19 +550,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -522,10 +575,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -548,12 +602,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +615,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -584,13 +632,15 @@
- done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -600,8 +650,9 @@
- all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(rcdir)
--
-+ for dir in "$(DESTDIR)$(rcdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -621,7 +672,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -643,6 +694,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -677,22 +730,19 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-rcDATA install-recursive install-strip installcheck \
-- installcheck-am installdirs installdirs-am \
-- installdirs-recursive maintainer-clean maintainer-clean-generic \
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-rcDATA install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-rcDATA uninstall-recursive
-+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
-+ uninstall-rcDATA
-
-
- # i18n translation tips messages
-@@ -708,15 +758,24 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=configure.in.bot configure.in.in Makefile.in kipiplugins.kdevelop tips
-+KDE_DIST=configure.in.bot configure.in.in Makefile.in kipiplugins.kdevelop tips Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign kipi-plugins/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
-
-
---- kipi-plugins/acquireimages/Makefile.in
-+++ kipi-plugins/acquireimages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,67 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/acquireimages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_acquireimages_la_OBJECTS = plugin_acquireimages.lo \
-+ acquireimagedialog.lo screenshotdialog.lo
-+#>- kipiplugin_acquireimages_la_OBJECTS = \
-+#>- $(am_kipiplugin_acquireimages_la_OBJECTS)
-+#>+ 5
-+kipiplugin_acquireimages_la_final_OBJECTS = kipiplugin_acquireimages_la.all_cpp.lo
-+kipiplugin_acquireimages_la_nofinal_OBJECTS = plugin_acquireimages.lo \
-+ acquireimagedialog.lo screenshotdialog.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +236,9 @@
+--- kipi-plugins/batchprocessimages/data/Makefile.in
++++ kipi-plugins/batchprocessimages/data/Makefile.in
+@@ -198,6 +198,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -20080,538 +14900,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +299,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +372,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -345,101 +412,78 @@
-
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_acquireimages.desktop
--subdir = kipi-plugins/acquireimages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_acquireimages_la_OBJECTS = plugin_acquireimages.lo \
-- acquireimagedialog.lo screenshotdialog.lo
--#>- kipiplugin_acquireimages_la_OBJECTS = \
--#>- $(am_kipiplugin_acquireimages_la_OBJECTS)
--#>+ 5
--kipiplugin_acquireimages_la_final_OBJECTS = kipiplugin_acquireimages_la.all_cpp.lo
--kipiplugin_acquireimages_la_nofinal_OBJECTS = plugin_acquireimages.lo \
-- acquireimagedialog.lo screenshotdialog.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_acquireimages_la_OBJECTS = $(kipiplugin_acquireimages_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/acquireimagedialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_acquireimages.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/screenshotdialog.Plo
--#>+ 6
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_acquireimages_la.all_cpp.P ./$(DEPDIR)/acquireimagedialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_acquireimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/screenshotdialog.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/acquireimagedialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_acquireimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/screenshotdialog.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_acquireimages_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
+@@ -361,7 +364,7 @@
all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -370,9 +373,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
+-#>- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile
++#>- $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -382,9 +385,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile
-+ $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/acquireimages/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/data/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -399,9 +402,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
+ 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)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -450,7 +494,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_acquireimages_la_LDFLAGS) $(kipiplugin_acquireimages_la_OBJECTS) $(kipiplugin_acquireimages_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -460,37 +504,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/screenshotdialog.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
- -rm -f *.lo
-@@ -501,33 +533,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
+@@ -578,9 +581,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/data/Makefile.in
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -536,6 +559,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -547,10 +571,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -573,12 +598,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -592,7 +611,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -610,9 +629,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -632,7 +652,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -657,13 +677,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -699,8 +723,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -753,7 +777,7 @@
- -rm -f screenshotdialog.moc acquireimagedialog.moc plugin_acquireimages.moc
-
- #>+ 2
--KDE_DIST=acquireimagedialog.h screenshotdialog.h kipiplugin_acquireimages.desktop Makefile.in plugin_acquireimages.h
-+KDE_DIST=acquireimagedialog.h screenshotdialog.h kipiplugin_acquireimages.desktop Makefile.in Makefile.am plugin_acquireimages.h
-
- #>+ 3
- clean-closures:
-@@ -762,10 +786,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/acquireimages/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign kipi-plugins/acquireimages/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/acquireimages/Makefile.in
-
-
--- kipi-plugins/batchprocessimages/Makefile.in
+++ kipi-plugins/batchprocessimages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,100 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/batchprocessimages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_batchprocessimages_la_OBJECTS = \
-+ plugin_batchprocessimages.lo batchprocessimagesitem.lo \
-+ outputdialog.lo imagepreview.lo renameimagesdialog.lo \
-+ borderimagesdialog.lo borderoptionsdialog.lo \
-+ convertimagesdialog.lo convertoptionsdialog.lo \
-+ filterimagesdialog.lo filteroptionsdialog.lo \
-+ colorimagesdialog.lo coloroptionsdialog.lo \
-+ effectimagesdialog.lo effectoptionsdialog.lo \
-+ recompressimagesdialog.lo recompressoptionsdialog.lo \
-+ resizeimagesdialog.lo resizeoptionsdialog.lo \
-+ batchprocessimagesdialog.lo batchprocessimageslist.lo \
-+ renameimageswidget.lo
-+#>- kipiplugin_batchprocessimages_la_OBJECTS = \
-+#>- $(am_kipiplugin_batchprocessimages_la_OBJECTS)
-+#>+ 14
-+kipiplugin_batchprocessimages_la_final_OBJECTS = kipiplugin_batchprocessimages_la.all_cpp.lo
-+kipiplugin_batchprocessimages_la_nofinal_OBJECTS = plugin_batchprocessimages.lo batchprocessimagesitem.lo \
-+ outputdialog.lo imagepreview.lo renameimagesdialog.lo \
-+ borderimagesdialog.lo borderoptionsdialog.lo \
-+ convertimagesdialog.lo convertoptionsdialog.lo \
-+ filterimagesdialog.lo filteroptionsdialog.lo \
-+ colorimagesdialog.lo coloroptionsdialog.lo \
-+ effectimagesdialog.lo effectoptionsdialog.lo \
-+ recompressimagesdialog.lo recompressoptionsdialog.lo \
-+ resizeimagesdialog.lo resizeoptionsdialog.lo \
-+ batchprocessimagesdialog.lo batchprocessimageslist.lo \
-+ renameimageswidget.lo renameimagesbase.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +269,9 @@
+@@ -269,6 +269,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -20621,671 +14969,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +332,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +405,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -371,193 +471,80 @@
+@@ -476,7 +479,7 @@
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_batchprocessimages.desktop
--
- kipibatchprocessimagesicondir = $(kde_datadir)/kipiplugin_batchprocessimages/icons
- kipibatchprocessimagesicon_ICON = AUTO
--subdir = kipi-plugins/batchprocessimages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_batchprocessimages_la_OBJECTS = \
-- plugin_batchprocessimages.lo batchprocessimagesitem.lo \
-- outputdialog.lo imagepreview.lo renameimagesdialog.lo \
-- borderimagesdialog.lo borderoptionsdialog.lo \
-- convertimagesdialog.lo convertoptionsdialog.lo \
-- filterimagesdialog.lo filteroptionsdialog.lo \
-- colorimagesdialog.lo coloroptionsdialog.lo \
-- effectimagesdialog.lo effectoptionsdialog.lo \
-- recompressimagesdialog.lo recompressoptionsdialog.lo \
-- resizeimagesdialog.lo resizeoptionsdialog.lo \
-- batchprocessimagesdialog.lo batchprocessimageslist.lo \
-- renameimageswidget.lo
--#>- kipiplugin_batchprocessimages_la_OBJECTS = \
--#>- $(am_kipiplugin_batchprocessimages_la_OBJECTS)
--#>+ 14
--kipiplugin_batchprocessimages_la_final_OBJECTS = kipiplugin_batchprocessimages_la.all_cpp.lo
--kipiplugin_batchprocessimages_la_nofinal_OBJECTS = plugin_batchprocessimages.lo batchprocessimagesitem.lo \
-- outputdialog.lo imagepreview.lo renameimagesdialog.lo \
-- borderimagesdialog.lo borderoptionsdialog.lo \
-- convertimagesdialog.lo convertoptionsdialog.lo \
-- filterimagesdialog.lo filteroptionsdialog.lo \
-- colorimagesdialog.lo coloroptionsdialog.lo \
-- effectimagesdialog.lo effectoptionsdialog.lo \
-- recompressimagesdialog.lo recompressoptionsdialog.lo \
-- resizeimagesdialog.lo resizeoptionsdialog.lo \
-- batchprocessimagesdialog.lo batchprocessimageslist.lo \
-- renameimageswidget.lo renameimagesbase.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_batchprocessimages_la_OBJECTS = $(kipiplugin_batchprocessimages_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/batchprocessimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/batchprocessimagesitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/batchprocessimageslist.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/borderimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/borderoptionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/colorimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/coloroptionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/convertimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/convertoptionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/effectimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/effectoptionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/filterimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/filteroptionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/outputdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_batchprocessimages.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/recompressimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/recompressoptionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/renameimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/renameimageswidget.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/resizeimagesdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/resizeoptionsdialog.Plo
--#>+ 44
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/renameimagesbase.P $(DEPDIR)/kipiplugin_batchprocessimages_la.all_cpp.P ./$(DEPDIR)/batchprocessimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/batchprocessimagesitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/batchprocessimageslist.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/borderimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/borderoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/colorimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/coloroptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/convertimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/convertoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/effectimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/effectoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filterimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filteroptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/outputdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_batchprocessimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/recompressimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/recompressoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/renameimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/renameimageswidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resizeimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resizeoptionsdialog.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/renameimagesbase.P ./$(DEPDIR)/batchprocessimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/batchprocessimagesitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/batchprocessimageslist.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/borderimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/borderoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/colorimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/coloroptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/convertimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/convertoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/effectimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/effectoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filterimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filteroptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/outputdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_batchprocessimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/recompressimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/recompressoptionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/renameimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/renameimageswidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resizeimagesdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resizeoptionsdialog.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(kipiplugin_batchprocessimages_la_SOURCES)
--
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -485,9 +488,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -497,9 +500,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -514,9 +517,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -568,7 +555,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_batchprocessimages_la_LDFLAGS) $(kipiplugin_batchprocessimages_la_OBJECTS) $(kipiplugin_batchprocessimages_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -597,37 +584,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/resizeoptionsdialog.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -638,23 +613,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -664,7 +638,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 \
-@@ -676,7 +656,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; \
+@@ -1141,9 +1144,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -684,7 +664,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)' ;; \
-@@ -705,7 +691,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -716,14 +702,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -732,19 +710,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -754,10 +735,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -780,12 +762,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -799,7 +775,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -814,15 +790,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -832,8 +810,9 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
--
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -853,7 +832,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -878,13 +857,17 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde-icons install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: install-kde-icons \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -922,25 +905,22 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-kde_servicesDATA \
-- install-man install-recursive install-strip installcheck \
-- installcheck-am installdirs installdirs-am \
-- installdirs-recursive maintainer-clean maintainer-clean-generic \
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-kde_moduleLTLIBRARIES \
-+ install-kde_servicesDATA install-man install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-- tags-recursive uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
-- uninstall-kde_servicesDATA uninstall-recursive
-+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+ uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-+ uninstall-kde_servicesDATA
-
-
- # i18n translation messages
-@@ -1118,7 +1098,7 @@
- -rm -f plugin_batchprocessimages.moc borderoptionsdialog.moc borderimagesdialog.moc colorimagesdialog.moc renameimagesdialog.moc outputdialog.moc coloroptionsdialog.moc convertimagesdialog.moc convertoptionsdialog.moc effectimagesdialog.moc filterimagesdialog.moc renameimagesoptionsdialog.moc imagepreview.moc filteroptionsdialog.moc effectoptionsdialog.moc renameimageswidget.moc resizeimagesdialog.moc batchprocessimageslist.moc recompressoptionsdialog.moc recompressimagesdialog.moc resizeoptionsdialog.moc batchprocessimagesdialog.moc
-
- #>+ 2
--KDE_DIST=hi32-action-recompressimages.png renameimagesoptionsdialog.h effectoptionsdialog.h resizeoptionsdialog.h filteroptionsdialog.h recompressoptionsdialog.h batchprocessimagesitem.h hi32-action-renameimages.png renameimageswidget.h recompressimagesdialog.h colorimagesdialog.h hi32-action-effectimages.png filterimagesdialog.h convertimagesdialog.h outputdialog.h batchprocessimagesdialog.h hi32-action-colorimages.png batchprocessimageslist.h hi32-action-borderimages.png Makefile.in plugin_batchprocessimages.h hi32-action-convertimages.png borderimagesdialog.h renameimagesoptionsdialog.cpp kipiplugin_batchprocessimages.desktop convertoptionsdialog.h hi32-action-resizeimages.png effectimagesdialog.h renameimagesdialog.h imagepreview.h coloroptionsdialog.h hi32-action-filterimages.png renameimagesbase.ui borderoptionsdialog.h resizeimagesdialog.h
-+KDE_DIST=hi32-action-recompressimages.png renameimagesoptionsdialog.h effectoptionsdialog.h resizeoptionsdialog.h filteroptionsdialog.h recompressoptionsdialog.h batchprocessimagesitem.h hi32-action-renameimages.png renameimageswidget.h recompressimagesdialog.h colorimagesdialog.h hi32-action-effectimages.png filterimagesdialog.h convertimagesdialog.h outputdialog.h batchprocessimagesdialog.h hi32-action-colorimages.png batchprocessimageslist.h hi32-action-borderimages.png Makefile.in plugin_batchprocessimages.h hi32-action-convertimages.png borderimagesdialog.h renameimagesoptionsdialog.cpp kipiplugin_batchprocessimages.desktop convertoptionsdialog.h hi32-action-resizeimages.png effectimagesdialog.h renameimagesdialog.h imagepreview.h coloroptionsdialog.h hi32-action-filterimages.png renameimagesbase.ui Makefile.am borderoptionsdialog.h resizeimagesdialog.h
-
- #>+ 4
- clean-ui:
-@@ -1154,10 +1134,19 @@
- -rm -f $(DESTDIR)$(kipibatchprocessimagesicondir)/hicolor/32x32/actions/recompressimages.png
- -rm -f $(DESTDIR)$(kipibatchprocessimagesicondir)/hicolor/32x32/actions/filterimages.png
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/Makefile.in
---- kipi-plugins/batchprocessimages/data/Makefile.in
-+++ kipi-plugins/batchprocessimages/data/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -22,7 +22,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +38,30 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/batchprocessimages/data
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kipibatchprocessimagespicdir)"
-+kipibatchprocessimagespicDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kipibatchprocessimagespic_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +198,9 @@
+--- kipi-plugins/calendar/Makefile.in
++++ kipi-plugins/calendar/Makefile.in
+@@ -237,6 +237,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -21295,334 +15038,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +261,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +334,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,29 +359,53 @@
- xdg_menudir = @xdg_menudir@
- kipibatchprocessimagespicdir = $(kde_datadir)/kipiplugin_batchprocessimages/data
- kipibatchprocessimagespic_DATA = handcursor.png
--subdir = kipi-plugins/batchprocessimages/data
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(kipibatchprocessimagespic_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -413,7 +416,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ .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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -422,9 +425,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
+-#>- $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile
++#>- $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -434,9 +437,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile
-+ $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/data/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+- $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -451,9 +454,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
+ 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:
- -rm -f *.lo
-@@ -363,23 +416,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kipibatchprocessimagespicDATA_INSTALL = $(INSTALL_DATA)
- install-kipibatchprocessimagespicDATA: $(kipibatchprocessimagespic_DATA)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipibatchprocessimagespicdir)
-+ test -z "$(kipibatchprocessimagespicdir)" || $(mkdir_p) "$(DESTDIR)$(kipibatchprocessimagespicdir)"
- @list='$(kipibatchprocessimagespic_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipibatchprocessimagespicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
-- $(kipibatchprocessimagespicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipibatchprocessimagespicDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f'"; \
-+ $(kipibatchprocessimagespicDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
- done
+@@ -816,9 +819,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
- uninstall-kipibatchprocessimagespicDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipibatchprocessimagespic_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
-- rm -f $(DESTDIR)$(kipibatchprocessimagespicdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipibatchprocessimagespicdir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -387,12 +439,6 @@
- ctags: CTAGS
- CTAGS:
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -406,7 +452,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -424,9 +470,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kipibatchprocessimagespicdir)
-+ for dir in "$(DESTDIR)$(kipibatchprocessimagespicdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -446,7 +493,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -467,6 +514,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -497,17 +546,19 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-kipibatchprocessimagespicDATA
-+uninstall-am: uninstall-info-am \
-+ uninstall-kipibatchprocessimagespicDATA
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-kipibatchprocessimagespicDATA \
-- install-man install-strip installcheck installcheck-am \
-- installdirs maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-- ps ps-am uninstall uninstall-am uninstall-info-am \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am \
-+ install-kipibatchprocessimagespicDATA install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ uninstall uninstall-am uninstall-info-am \
- uninstall-kipibatchprocessimagespicDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-@@ -515,15 +566,24 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=handcursor.png Makefile.in
-+KDE_DIST=handcursor.png Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/batchprocessimages/data/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign kipi-plugins/batchprocessimages/data/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/batchprocessimages/data/Makefile.in
-
-
---- kipi-plugins/calendar/Makefile.in
-+++ kipi-plugins/calendar/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,68 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/calendar
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_calendar_la_OBJECTS = plugin_calendar.lo calwizard.lo \
-+ caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
-+ calselect.lo monthwidget.lo
-+#>- kipiplugin_calendar_la_OBJECTS = $(am_kipiplugin_calendar_la_OBJECTS)
-+#>+ 6
-+kipiplugin_calendar_la_final_OBJECTS = kipiplugin_calendar_la.all_cpp.lo
-+kipiplugin_calendar_la_nofinal_OBJECTS = plugin_calendar.lo calwizard.lo \
-+ caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
-+ calselect.lo monthwidget.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_calendar_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_calendar_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +237,9 @@
+--- kipi-plugins/cdarchiving/autorun/Makefile.in
++++ kipi-plugins/cdarchiving/autorun/Makefile.in
+@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -21632,543 +15107,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +300,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +373,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -339,120 +407,81 @@
- calwidget.cpp calpainter.cpp calselect.cpp \
- monthwidget.cpp
-
--
- kipiplugin_calendar_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_calendar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_calendar.desktop
--subdir = kipi-plugins/calendar
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_calendar_la_OBJECTS = plugin_calendar.lo calwizard.lo \
-- caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
-- calselect.lo monthwidget.lo
--#>- kipiplugin_calendar_la_OBJECTS = $(am_kipiplugin_calendar_la_OBJECTS)
--#>+ 6
--kipiplugin_calendar_la_final_OBJECTS = kipiplugin_calendar_la.all_cpp.lo
--kipiplugin_calendar_la_nofinal_OBJECTS = plugin_calendar.lo calwizard.lo \
-- caltemplate.lo calsettings.lo calwidget.lo calpainter.lo \
-- calselect.lo monthwidget.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_calendar_la_OBJECTS = $(kipiplugin_calendar_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/calpainter.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/calselect.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/calsettings.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/caltemplate.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/calwidget.Plo ./$(DEPDIR)/calwizard.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/monthwidget.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_calendar.Plo
--#>+ 14
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_calendar_la.all_cpp.P ./$(DEPDIR)/calpainter.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/calselect.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/calsettings.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/caltemplate.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/calwidget.Plo ./$(DEPDIR)/calwizard.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/monthwidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_calendar.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/calpainter.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/calselect.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/calsettings.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/caltemplate.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/calwidget.Plo ./$(DEPDIR)/calwizard.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/monthwidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_calendar.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_calendar_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_calendar_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
+@@ -365,7 +368,7 @@
all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile'; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -374,9 +377,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile'; \
+-#>- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile
++#>- $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -386,9 +389,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile
-+ $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/autorun/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -403,9 +406,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
+ 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)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -463,7 +492,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_calendar_la_LDFLAGS) $(kipiplugin_calendar_la_OBJECTS) $(kipiplugin_calendar_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -478,37 +507,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_calendar.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
- -rm -f *.lo
-@@ -519,33 +536,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
+@@ -599,9 +602,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/autorun/Makefile.in
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -554,6 +562,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -565,10 +574,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -591,12 +601,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -610,7 +614,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -628,9 +632,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -650,7 +655,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -675,13 +680,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -717,8 +726,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -791,7 +800,7 @@
- -rm -f calwizard.moc calselect.moc plugin_calendar.moc calpainter.moc monthwidget.moc caltemplate.moc
-
- #>+ 2
--KDE_DIST=monthwidget.h calwidget.h kipiplugin_calendar.desktop calpainter.h calprint.h calwizard.h Makefile.in plugin_calendar.h calsettings.h calselect.h caltemplate.h
-+KDE_DIST=monthwidget.h calwidget.h kipiplugin_calendar.desktop calpainter.h calprint.h calwizard.h Makefile.in plugin_calendar.h calsettings.h calselect.h Makefile.am caltemplate.h
-
- #>+ 3
- clean-closures:
-@@ -800,10 +809,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/calendar/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign kipi-plugins/calendar/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/calendar/Makefile.in
-
-
--- kipi-plugins/cdarchiving/Makefile.in
+++ kipi-plugins/cdarchiving/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,86 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/cdarchiving
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)" \
-+ "$(DESTDIR)$(kipiHTML401picdir)" \
-+ "$(DESTDIR)$(kipiimagebrokenpicdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_cdarchiving_la_OBJECTS = plugin_cdarchiving.lo \
-+ cdarchivingdialog.lo cdarchiving.lo
-+#>- kipiplugin_cdarchiving_la_OBJECTS = \
-+#>- $(am_kipiplugin_cdarchiving_la_OBJECTS)
-+#>+ 5
-+kipiplugin_cdarchiving_la_final_OBJECTS = kipiplugin_cdarchiving_la.all_cpp.lo
-+kipiplugin_cdarchiving_la_nofinal_OBJECTS = plugin_cdarchiving.lo \
-+ cdarchivingdialog.lo cdarchiving.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+kipiHTML401picDATA_INSTALL = $(INSTALL_DATA)
-+kipiimagebrokenpicDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA) $(kipiHTML401pic_DATA) \
-+ $(kipiimagebrokenpic_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +255,9 @@
+@@ -255,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -22178,1021 +15176,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +318,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +391,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -347,121 +433,82 @@
+@@ -440,7 +443,7 @@
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_cdarchiving.desktop
--
- kipiimagebrokenpicdir = $(kde_datadir)/kipi/data
- kipiimagebrokenpic_DATA = image_broken.png
--
- kipiHTML401picdir = $(kde_datadir)/kipi
- kipiHTML401pic_DATA = valid-html401.png gohome.png up.png
--subdir = kipi-plugins/cdarchiving
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_cdarchiving_la_OBJECTS = plugin_cdarchiving.lo \
-- cdarchivingdialog.lo cdarchiving.lo
--#>- kipiplugin_cdarchiving_la_OBJECTS = \
--#>- $(am_kipiplugin_cdarchiving_la_OBJECTS)
--#>+ 5
--kipiplugin_cdarchiving_la_final_OBJECTS = kipiplugin_cdarchiving_la.all_cpp.lo
--kipiplugin_cdarchiving_la_nofinal_OBJECTS = plugin_cdarchiving.lo \
-- cdarchivingdialog.lo cdarchiving.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_cdarchiving_la_OBJECTS = $(kipiplugin_cdarchiving_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cdarchiving.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/cdarchivingdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_cdarchiving.Plo
--#>+ 6
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_cdarchiving_la.all_cpp.P ./$(DEPDIR)/cdarchiving.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cdarchivingdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_cdarchiving.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/cdarchiving.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cdarchivingdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_cdarchiving.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
--DATA = $(kde_services_DATA) $(kipiHTML401pic_DATA) \
-- $(kipiimagebrokenpic_DATA)
--
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(kipiplugin_cdarchiving_la_SOURCES)
--
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -449,9 +452,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -461,9 +464,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -478,9 +481,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -472,7 +519,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_cdarchiving_la_LDFLAGS) $(kipiplugin_cdarchiving_la_OBJECTS) $(kipiplugin_cdarchiving_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -482,37 +529,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_cdarchiving.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -523,59 +558,56 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
--kipiHTML401picDATA_INSTALL = $(INSTALL_DATA)
- install-kipiHTML401picDATA: $(kipiHTML401pic_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipiHTML401picdir)
-+ test -z "$(kipiHTML401picdir)" || $(mkdir_p) "$(DESTDIR)$(kipiHTML401picdir)"
- @list='$(kipiHTML401pic_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipiHTML401picDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiHTML401picdir)/$$f"; \
-- $(kipiHTML401picDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiHTML401picdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipiHTML401picDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiHTML401picdir)/$$f'"; \
-+ $(kipiHTML401picDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiHTML401picdir)/$$f"; \
- done
-
- uninstall-kipiHTML401picDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipiHTML401pic_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipiHTML401picdir)/$$f"; \
-- rm -f $(DESTDIR)$(kipiHTML401picdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipiHTML401picdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipiHTML401picdir)/$$f"; \
- done
--kipiimagebrokenpicDATA_INSTALL = $(INSTALL_DATA)
- install-kipiimagebrokenpicDATA: $(kipiimagebrokenpic_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipiimagebrokenpicdir)
-+ test -z "$(kipiimagebrokenpicdir)" || $(mkdir_p) "$(DESTDIR)$(kipiimagebrokenpicdir)"
- @list='$(kipiimagebrokenpic_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipiimagebrokenpicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
-- $(kipiimagebrokenpicDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiimagebrokenpicdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipiimagebrokenpicDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiimagebrokenpicdir)/$$f'"; \
-+ $(kipiimagebrokenpicDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
- done
-
- uninstall-kipiimagebrokenpicDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipiimagebrokenpic_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
-- rm -f $(DESTDIR)$(kipiimagebrokenpicdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipiimagebrokenpicdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipiimagebrokenpicdir)/$$f"; \
- done
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -585,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 \
-@@ -597,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; \
+@@ -962,9 +965,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -605,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)' ;; \
-@@ -626,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 \
-@@ -637,14 +681,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -653,19 +689,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -675,10 +714,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -701,12 +741,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -720,7 +754,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -735,15 +769,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -753,8 +789,9 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir) $(DESTDIR)$(kipiHTML401picdir) $(DESTDIR)$(kipiimagebrokenpicdir)
--
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kipiHTML401picdir)" "$(DESTDIR)$(kipiimagebrokenpicdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -774,7 +811,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -799,15 +836,19 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
--#>- install-kipiHTML401picDATA install-kipiimagebrokenpicDATA
--#>+ 2
--install-data-am: install-kde_servicesDATA \
-- install-kipiHTML401picDATA install-kipiimagebrokenpicDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA install-kipiHTML401picDATA \
-+#>- install-kipiimagebrokenpicDATA
-+#>+ 3
-+install-data-am: \
-+ install-kde_servicesDATA install-kipiHTML401picDATA \
-+ install-kipiimagebrokenpicDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -843,27 +884,24 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-kde_servicesDATA \
-- install-kipiHTML401picDATA install-kipiimagebrokenpicDATA \
-- install-man install-recursive install-strip installcheck \
-- installcheck-am installdirs installdirs-am \
-- installdirs-recursive maintainer-clean maintainer-clean-generic \
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-kde_moduleLTLIBRARIES \
-+ install-kde_servicesDATA install-kipiHTML401picDATA \
-+ install-kipiimagebrokenpicDATA install-man install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-- tags-recursive uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
-+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+ uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
- uninstall-kde_servicesDATA uninstall-kipiHTML401picDATA \
-- uninstall-kipiimagebrokenpicDATA uninstall-recursive
-+ uninstall-kipiimagebrokenpicDATA
-
-
- # i18n translation messages
-@@ -908,7 +946,7 @@
- -rm -f cdarchivingdialog.moc plugin_cdarchiving.moc cdarchiving.moc
-
- #>+ 2
--KDE_DIST=kipiplugin_cdarchiving.desktop cdarchiving.h up.png Makefile.in cdarchivingdialog.h image_broken.png gohome.png valid-html401.png plugin_cdarchiving.h actions.h
-+KDE_DIST=kipiplugin_cdarchiving.desktop cdarchiving.h up.png Makefile.in cdarchivingdialog.h image_broken.png gohome.png valid-html401.png plugin_cdarchiving.h actions.h Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -917,10 +955,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/Makefile.in
---- kipi-plugins/cdarchiving/autorun/Makefile.in
-+++ kipi-plugins/cdarchiving/autorun/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -22,7 +22,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +38,32 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/cdarchiving/autorun
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kipiautorundir)" \
-+ "$(DESTDIR)$(kipidatadir)"
-+kipiautorunDATA_INSTALL = $(INSTALL_DATA)
-+kipidataDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kipiautorun_DATA) $(kipidata_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +200,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAGICK_CONFIG = @MAGICK_CONFIG@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -235,6 +263,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +336,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,32 +361,55 @@
- xdg_menudir = @xdg_menudir@
- kipidatadir = $(kde_datadir)/kipi/data
- kipidata_DATA = index.htm
--
- kipiautorundir = $(kde_datadir)/kipi/data/autorun
- kipiautorun_DATA = cdalbums.ico ShellExecute.bat
--subdir = kipi-plugins/cdarchiving/autorun
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(kipiautorun_DATA) $(kipidata_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-+#>- @for dep in $?; do \
-+#>- case '$(am__configure_deps)' in \
-+#>- *$$dep*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
- #>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile
-+ $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/autorun/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -366,41 +420,39 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kipiautorunDATA_INSTALL = $(INSTALL_DATA)
- install-kipiautorunDATA: $(kipiautorun_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipiautorundir)
-+ test -z "$(kipiautorundir)" || $(mkdir_p) "$(DESTDIR)$(kipiautorundir)"
- @list='$(kipiautorun_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipiautorunDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiautorundir)/$$f"; \
-- $(kipiautorunDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiautorundir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipiautorunDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiautorundir)/$$f'"; \
-+ $(kipiautorunDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiautorundir)/$$f"; \
- done
-
- uninstall-kipiautorunDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipiautorun_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipiautorundir)/$$f"; \
-- rm -f $(DESTDIR)$(kipiautorundir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipiautorundir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipiautorundir)/$$f"; \
- done
--kipidataDATA_INSTALL = $(INSTALL_DATA)
- install-kipidataDATA: $(kipidata_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipidatadir)
-+ test -z "$(kipidatadir)" || $(mkdir_p) "$(DESTDIR)$(kipidatadir)"
- @list='$(kipidata_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipidataDATA_INSTALL) $$d$$p $(DESTDIR)$(kipidatadir)/$$f"; \
-- $(kipidataDATA_INSTALL) $$d$$p $(DESTDIR)$(kipidatadir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipidatadir)/$$f'"; \
-+ $(kipidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipidatadir)/$$f"; \
- done
-
- uninstall-kipidataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipidata_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipidatadir)/$$f"; \
-- rm -f $(DESTDIR)$(kipidatadir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipidatadir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipidatadir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -408,12 +460,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -427,7 +473,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -445,9 +491,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kipiautorundir) $(DESTDIR)$(kipidatadir)
-+ for dir in "$(DESTDIR)$(kipiautorundir)" "$(DESTDIR)$(kipidatadir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -467,7 +514,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -488,6 +535,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -523,29 +572,39 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-kipiautorunDATA install-kipidataDATA \
-- install-man install-strip installcheck installcheck-am \
-- installdirs maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-- ps ps-am uninstall uninstall-am uninstall-info-am \
-- uninstall-kipiautorunDATA uninstall-kipidataDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-kipiautorunDATA \
-+ install-kipidataDATA install-man install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+ uninstall-info-am uninstall-kipiautorunDATA \
-+ uninstall-kipidataDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.htm cdalbums.ico Makefile.in ShellExecute.bat
-+KDE_DIST=index.htm cdalbums.ico Makefile.in ShellExecute.bat Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/cdarchiving/autorun/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign kipi-plugins/cdarchiving/autorun/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/cdarchiving/autorun/Makefile.in
-
-
--- kipi-plugins/findimages/Makefile.in
+++ kipi-plugins/findimages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,71 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/findimages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_findimages_la_OBJECTS = plugin_findimages.lo \
-+ displaycompare.lo finddupplicateimages.lo \
-+ finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
-+ actions.lo
-+#>- kipiplugin_findimages_la_OBJECTS = \
-+#>- $(am_kipiplugin_findimages_la_OBJECTS)
-+#>+ 7
-+kipiplugin_findimages_la_final_OBJECTS = kipiplugin_findimages_la.all_cpp.lo
-+kipiplugin_findimages_la_nofinal_OBJECTS = plugin_findimages.lo \
-+ displaycompare.lo finddupplicateimages.lo \
-+ finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
-+ actions.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_findimages_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_findimages_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +240,9 @@
+@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -23202,535 +15245,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +303,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +376,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -333,7 +404,6 @@
+@@ -425,7 +428,7 @@
- # Install this plugin in the KDE modules directory
- kde_module_LTLIBRARIES = kipiplugin_findimages.la
--
- kipiplugin_findimages_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
-
- # Srcs for the plugin
-@@ -350,120 +420,80 @@
-
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_findimages.desktop
--
- kipifindimagesicondir = $(kde_datadir)/kipiplugin_findimages/icons
- kipifindimagesicon_ICON = AUTO
--subdir = kipi-plugins/findimages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_findimages_la_OBJECTS = plugin_findimages.lo \
-- displaycompare.lo finddupplicateimages.lo \
-- finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
-- actions.lo
--#>- kipiplugin_findimages_la_OBJECTS = \
--#>- $(am_kipiplugin_findimages_la_OBJECTS)
--#>+ 7
--kipiplugin_findimages_la_final_OBJECTS = kipiplugin_findimages_la.all_cpp.lo
--kipiplugin_findimages_la_nofinal_OBJECTS = plugin_findimages.lo \
-- displaycompare.lo finddupplicateimages.lo \
-- finddupplicatedialog.lo fuzzycompare.lo fastcompare.lo \
-- actions.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_findimages_la_OBJECTS = $(kipiplugin_findimages_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/actions.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/displaycompare.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/fastcompare.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/finddupplicatedialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/finddupplicateimages.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/fuzzycompare.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_findimages.Plo
--#>+ 14
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_findimages_la.all_cpp.P ./$(DEPDIR)/actions.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/displaycompare.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fastcompare.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/finddupplicatedialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/finddupplicateimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fuzzycompare.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_findimages.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/actions.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/displaycompare.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fastcompare.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/finddupplicatedialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/finddupplicateimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fuzzycompare.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_findimages.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_findimages_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_findimages_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -434,9 +437,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -446,9 +449,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/findimages/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -463,9 +466,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -474,7 +504,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_findimages_la_LDFLAGS) $(kipiplugin_findimages_la_OBJECTS) $(kipiplugin_findimages_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -488,37 +518,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_findimages.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -529,33 +547,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -564,6 +573,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -575,10 +585,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -601,12 +612,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -620,7 +625,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -638,9 +643,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -660,7 +666,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -685,13 +691,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde-icons install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: install-kde-icons \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -730,8 +740,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -791,7 +801,7 @@
- -rm -f displaycompare.moc finddupplicatedialog.moc plugin_findimages.moc finddupplicateimages.moc
-
- #>+ 2
--KDE_DIST=fuzzycompare.h imagesimilaritydata.h compareoperation.h Doxyfile kipiplugin_findimages.desktop Makefile.in fastcompare.h finddupplicateimages.h plugin_findimages.h hi32-action-finddupplicateimages.png displaycompare.h finddupplicatedialog.h actions.h
-+KDE_DIST=fuzzycompare.h imagesimilaritydata.h compareoperation.h Doxyfile kipiplugin_findimages.desktop Makefile.in fastcompare.h finddupplicateimages.h plugin_findimages.h hi32-action-finddupplicateimages.png displaycompare.h finddupplicatedialog.h actions.h Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -808,10 +818,19 @@
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kipifindimagesicondir)/hicolor/32x32/actions/finddupplicateimages.png
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -825,9 +828,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/findimages/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/findimages/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/findimages/Makefile.in
--- kipi-plugins/flickrexport/Makefile.in
+++ kipi-plugins/flickrexport/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,70 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/flickrexport
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
-+ TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_flickrexport_la_OBJECTS = plugin_flickrexport.lo \
-+ flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
-+ mpform.lo flickrviewitem.lo exifrestorer.lo
-+#>- kipiplugin_flickrexport_la_OBJECTS = \
-+#>- $(am_kipiplugin_flickrexport_la_OBJECTS)
-+#>+ 6
-+kipiplugin_flickrexport_la_final_OBJECTS = kipiplugin_flickrexport_la.all_cpp.lo
-+kipiplugin_flickrexport_la_nofinal_OBJECTS = plugin_flickrexport.lo \
-+ flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
-+ mpform.lo flickrviewitem.lo exifrestorer.lo flickralbumdialog.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +239,9 @@
+@@ -239,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -23740,537 +15314,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +302,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +375,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -333,9 +403,7 @@
+@@ -420,7 +423,7 @@
- # Install this plugin in the KDE modules directory
- kde_module_LTLIBRARIES = kipiplugin_flickrexport.la
--
- kipiplugin_flickrexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
--
- #>- kipiplugin_flickrexport_la_SOURCES = plugin_flickrexport.cpp \
- #>- flickrwindow.cpp login.cpp flickrtalker.cpp \
- #>- flickrwidget.cpp mpform.cpp flickralbumdialog.ui \
-@@ -346,121 +414,81 @@
- flickrwidget.cpp mpform.cpp \
- flickrviewitem.cpp exifrestorer.cpp flickralbumdialog.cpp
-
--
- kipiplugin_flickrexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_flickrexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_flickrexport.desktop
--subdir = kipi-plugins/flickrexport
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_flickrexport_la_OBJECTS = plugin_flickrexport.lo \
-- flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
-- mpform.lo flickrviewitem.lo exifrestorer.lo
--#>- kipiplugin_flickrexport_la_OBJECTS = \
--#>- $(am_kipiplugin_flickrexport_la_OBJECTS)
--#>+ 6
--kipiplugin_flickrexport_la_final_OBJECTS = kipiplugin_flickrexport_la.all_cpp.lo
--kipiplugin_flickrexport_la_nofinal_OBJECTS = plugin_flickrexport.lo \
-- flickrwindow.lo login.lo flickrtalker.lo flickrwidget.lo \
-- mpform.lo flickrviewitem.lo exifrestorer.lo flickralbumdialog.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_flickrexport_la_OBJECTS = $(kipiplugin_flickrexport_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/flickrtalker.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/flickrviewitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/flickrwidget.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/flickrwindow.Plo ./$(DEPDIR)/login.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/mpform.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_flickrexport.Plo
--#>+ 14
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/flickralbumdialog.P $(DEPDIR)/kipiplugin_flickrexport_la.all_cpp.P ./$(DEPDIR)/exifrestorer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrtalker.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrwidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrwindow.Plo ./$(DEPDIR)/login.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mpform.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_flickrexport.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/flickralbumdialog.P ./$(DEPDIR)/exifrestorer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrtalker.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrwidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/flickrwindow.Plo ./$(DEPDIR)/login.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mpform.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_flickrexport.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am TODO
--SOURCES = $(kipiplugin_flickrexport_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -429,9 +432,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -441,9 +444,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/flickrexport/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -458,9 +461,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -471,7 +499,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_flickrexport_la_LDFLAGS) $(kipiplugin_flickrexport_la_OBJECTS) $(kipiplugin_flickrexport_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -486,37 +514,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_flickrexport.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -527,33 +543,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -562,6 +569,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -573,10 +581,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -599,12 +608,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -618,7 +621,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -636,9 +639,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -658,7 +662,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -683,13 +687,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -725,8 +733,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -788,7 +796,7 @@
- -rm -f flickrwidget.moc plugin_flickrexport.moc flickrwindow.moc flickrtalker.moc
-
- #>+ 2
--KDE_DIST=login.h flickralbumdialog.ui kipiplugin_flickrexport.desktop mpform.h flickrviewitem.h jpegsection.h flickritem.h flickrwidget.h plugin_flickrexport.h Makefile.in exifrestorer.h flickrwindow.h flickrtalker.h
-+KDE_DIST=login.h flickralbumdialog.ui kipiplugin_flickrexport.desktop mpform.h flickrviewitem.h jpegsection.h flickritem.h flickrwidget.h plugin_flickrexport.h Makefile.in exifrestorer.h flickrwindow.h flickrtalker.h Makefile.am
-
- #>+ 4
- clean-ui:
-@@ -802,10 +810,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -817,9 +820,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/flickrexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/flickrexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/flickrexport/Makefile.in
--- kipi-plugins/galleryexport/Makefile.in
+++ kipi-plugins/galleryexport/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,69 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/galleryexport
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_galleryexport_la_OBJECTS = plugin_galleryexport.lo \
-+ gallerywindow.lo gallerylogin.lo gallerytalker.lo \
-+ gallerywidget.lo gallerympform.lo galleryviewitem.lo
-+#>- kipiplugin_galleryexport_la_OBJECTS = \
-+#>- $(am_kipiplugin_galleryexport_la_OBJECTS)
-+#>+ 6
-+kipiplugin_galleryexport_la_final_OBJECTS = kipiplugin_galleryexport_la.all_cpp.lo
-+kipiplugin_galleryexport_la_nofinal_OBJECTS = plugin_galleryexport.lo \
-+ gallerywindow.lo gallerylogin.lo gallerytalker.lo \
-+ gallerywidget.lo gallerympform.lo galleryviewitem.lo galleryalbumdialog.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +238,9 @@
+@@ -238,6 +238,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -24280,530 +15383,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +301,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +374,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -333,9 +402,7 @@
+@@ -419,7 +422,7 @@
- # Install this plugin in the KDE modules directory
- kde_module_LTLIBRARIES = kipiplugin_galleryexport.la
--
- kipiplugin_galleryexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
--
- #>- kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
- #>- gallerywindow.cpp gallerylogin.cpp gallerytalker.cpp \
- #>- gallerywidget.cpp gallerympform.cpp galleryalbumdialog.ui \
-@@ -346,121 +413,81 @@
- gallerywidget.cpp gallerympform.cpp \
- galleryviewitem.cpp galleryalbumdialog.cpp
-
--
- kipiplugin_galleryexport_la_LIBADD = -lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_galleryexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_galleryexport.desktop
--subdir = kipi-plugins/galleryexport
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_galleryexport_la_OBJECTS = plugin_galleryexport.lo \
-- gallerywindow.lo gallerylogin.lo gallerytalker.lo \
-- gallerywidget.lo gallerympform.lo galleryviewitem.lo
--#>- kipiplugin_galleryexport_la_OBJECTS = \
--#>- $(am_kipiplugin_galleryexport_la_OBJECTS)
--#>+ 6
--kipiplugin_galleryexport_la_final_OBJECTS = kipiplugin_galleryexport_la.all_cpp.lo
--kipiplugin_galleryexport_la_nofinal_OBJECTS = plugin_galleryexport.lo \
-- gallerywindow.lo gallerylogin.lo gallerytalker.lo \
-- gallerywidget.lo gallerympform.lo galleryviewitem.lo galleryalbumdialog.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_galleryexport_la_OBJECTS = $(kipiplugin_galleryexport_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gallerylogin.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gallerympform.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gallerytalker.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/galleryviewitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gallerywidget.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gallerywindow.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_galleryexport.Plo
--#>+ 14
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/galleryalbumdialog.P $(DEPDIR)/kipiplugin_galleryexport_la.all_cpp.P ./$(DEPDIR)/gallerylogin.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerympform.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerytalker.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/galleryviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerywidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerywindow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_galleryexport.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/galleryalbumdialog.P ./$(DEPDIR)/gallerylogin.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerympform.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerytalker.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/galleryviewitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerywidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gallerywindow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_galleryexport.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
--SOURCES = $(kipiplugin_galleryexport_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -428,9 +431,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -440,9 +443,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/galleryexport/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -457,9 +460,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -471,7 +498,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_galleryexport_la_LDFLAGS) $(kipiplugin_galleryexport_la_OBJECTS) $(kipiplugin_galleryexport_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -485,37 +512,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_galleryexport.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -526,33 +541,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -561,6 +567,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -572,10 +579,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -598,12 +606,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -617,7 +619,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -635,9 +637,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -657,7 +660,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -682,13 +685,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -724,8 +731,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -787,7 +794,7 @@
- -rm -f gallerytalker.moc gallerywindow.moc gallerywidget.moc plugin_galleryexport.moc
-
- #>+ 2
--KDE_DIST=gallerywidget.h plugin_galleryexport.h gallerytalker.h gallerylogin.h gallerympform.h Makefile.in galleryviewitem.h kipiplugin_galleryexport.desktop galleryitem.h gallerywindow.h galleryalbumdialog.ui
-+KDE_DIST=gallerywidget.h plugin_galleryexport.h gallerytalker.h gallerylogin.h gallerympform.h Makefile.in galleryviewitem.h kipiplugin_galleryexport.desktop galleryitem.h gallerywindow.h galleryalbumdialog.ui Makefile.am
-
- #>+ 4
- clean-ui:
-@@ -801,10 +808,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -815,9 +818,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/galleryexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/galleryexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/galleryexport/Makefile.in
--- kipi-plugins/helloworld/Makefile.in
+++ kipi-plugins/helloworld/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,62 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/helloworld
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
-+#>- kipiplugin_helloworld_la_OBJECTS = \
-+#>- $(am_kipiplugin_helloworld_la_OBJECTS)
-+#>+ 1
-+kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_helloworld_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_helloworld_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +231,9 @@
+@@ -231,6 +231,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -24813,508 +15452,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +294,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +367,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -345,89 +407,78 @@
+@@ -410,7 +413,7 @@
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_helloworld.desktop
--subdir = kipi-plugins/helloworld
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
--#>- kipiplugin_helloworld_la_OBJECTS = \
--#>- $(am_kipiplugin_helloworld_la_OBJECTS)
--#>+ 1
--kipiplugin_helloworld_la_OBJECTS = plugin_helloworld.lo
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin_helloworld.Plo
--#>+ 1
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plugin_helloworld.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_helloworld_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_helloworld_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -419,9 +422,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -431,9 +434,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/helloworld/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -448,9 +451,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -438,7 +489,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_helloworld_la_LDFLAGS) $(kipiplugin_helloworld_la_OBJECTS) $(kipiplugin_helloworld_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -446,37 +497,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_helloworld.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -487,33 +526,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -522,6 +552,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -533,10 +564,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -559,12 +591,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -578,7 +604,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -596,9 +622,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -618,7 +645,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -643,13 +670,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -685,8 +716,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -726,7 +757,7 @@
- -rm -f plugin_helloworld.moc
-
- #>+ 2
--KDE_DIST=plugin_helloworld.h kipiplugin_helloworld.desktop Makefile.in
-+KDE_DIST=plugin_helloworld.h kipiplugin_helloworld.desktop Makefile.in Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -735,10 +766,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -773,9 +776,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/helloworld/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/helloworld/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/helloworld/Makefile.in
--- kipi-plugins/htmlexport/Makefile.in
+++ kipi-plugins/htmlexport/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,82 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/htmlexport
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_htmlexport_la_OBJECTS = generator.lo plugin.lo wizard.lo \
-+ theme.lo
-+#>- kipiplugin_htmlexport_la_OBJECTS = \
-+#>- $(am_kipiplugin_htmlexport_la_OBJECTS)
-+#>+ 5
-+kipiplugin_htmlexport_la_final_OBJECTS = kipiplugin_htmlexport_la.all_cpp.lo
-+kipiplugin_htmlexport_la_nofinal_OBJECTS = generator.lo plugin.lo wizard.lo \
-+ theme.lo themepage.lo imagesettingspage.lo outputpage.lo htmlexportconfig.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_kcfg_DATA) $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +251,9 @@
+@@ -251,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -25324,638 +15521,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +314,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +387,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -334,7 +416,6 @@
+@@ -448,7 +451,7 @@
- # Install this plugin in the KDE modules directory
- kde_module_LTLIBRARIES = kipiplugin_htmlexport.la
--
- kipiplugin_htmlexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
- #>- kipiplugin_htmlexport_la_SOURCES = \
- #>- generator.cpp \
-@@ -356,121 +437,86 @@
- theme.cpp \
- themepage.cpp imagesettingspage.cpp outputpage.cpp htmlexportconfig.cpp
-
--
- kde_kcfg_DATA = \
- htmlexportconfig.kcfg
-
--
- kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
- kipiplugin_htmlexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_htmlexport.desktop
--subdir = kipi-plugins/htmlexport
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_htmlexport_la_OBJECTS = generator.lo plugin.lo wizard.lo \
-- theme.lo
--#>- kipiplugin_htmlexport_la_OBJECTS = \
--#>- $(am_kipiplugin_htmlexport_la_OBJECTS)
--#>+ 5
--kipiplugin_htmlexport_la_final_OBJECTS = kipiplugin_htmlexport_la.all_cpp.lo
--kipiplugin_htmlexport_la_nofinal_OBJECTS = generator.lo plugin.lo wizard.lo \
-- theme.lo themepage.lo imagesettingspage.lo outputpage.lo htmlexportconfig.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_htmlexport_la_OBJECTS = $(kipiplugin_htmlexport_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/generator.Plo ./$(DEPDIR)/plugin.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/theme.Plo ./$(DEPDIR)/wizard.Plo
--#>+ 4
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/themepage.P $(DEPDIR)/imagesettingspage.P $(DEPDIR)/outputpage.P $(DEPDIR)/htmlexportconfig.P $(DEPDIR)/kipiplugin_htmlexport_la.all_cpp.P ./$(DEPDIR)/generator.Plo ./$(DEPDIR)/plugin.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/theme.Plo ./$(DEPDIR)/wizard.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/themepage.P $(DEPDIR)/imagesettingspage.P $(DEPDIR)/outputpage.P $(DEPDIR)/htmlexportconfig.P ./$(DEPDIR)/generator.Plo ./$(DEPDIR)/plugin.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/theme.Plo ./$(DEPDIR)/wizard.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
--DATA = $(kde_kcfg_DATA) $(kde_services_DATA)
--
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
--DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(kipiplugin_htmlexport_la_SOURCES)
--
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -457,9 +460,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -469,9 +472,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -486,9 +489,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -481,7 +527,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_htmlexport_la_LDFLAGS) $(kipiplugin_htmlexport_la_OBJECTS) $(kipiplugin_htmlexport_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -492,37 +538,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wizard.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -533,41 +567,39 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
- install-kde_kcfgDATA: $(kde_kcfg_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_kcfgdir)
-+ test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)"
- @list='$(kde_kcfg_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_kcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_kcfgdir)/$$f"; \
-- $(kde_kcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_kcfgdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_kcfgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
-+ $(kde_kcfgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
- done
-
- uninstall-kde_kcfgDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_kcfg_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_kcfgdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_kcfgdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
- done
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -577,7 +609,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 +627,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; \
+@@ -962,9 +965,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -597,7 +635,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 +662,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 \
-@@ -629,14 +673,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -645,19 +681,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -667,10 +706,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -693,12 +733,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -712,7 +746,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -727,15 +761,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -745,8 +781,9 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_kcfgdir) $(DESTDIR)$(kde_servicesdir)
--
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -766,7 +803,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -791,6 +828,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -834,26 +873,23 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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_kcfgDATA install-kde_moduleLTLIBRARIES \
-- install-kde_servicesDATA install-man install-recursive \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am installdirs-recursive maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-- ps-recursive tags tags-recursive uninstall uninstall-am \
-- uninstall-info-am uninstall-info-recursive \
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-kde_kcfgDATA \
-+ install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-+ install-man install-strip installcheck installcheck-am \
-+ installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-kde_kcfgDATA uninstall-kde_moduleLTLIBRARIES \
-- uninstall-kde_servicesDATA uninstall-recursive
-+ uninstall-kde_servicesDATA
-
-
- # i18n translation messages
-@@ -898,7 +934,7 @@
- -rm -f wizard.moc plugin.moc generator.moc
-
- #>+ 2
--KDE_DIST=xmlutils.h outputpage.ui kipiplugin_htmlexport.desktop htmlexportconfig.kcfg wizard.h theme.h plugin.h generator.h galleryinfo.h imagesettingspage.ui Makefile.in themepage.ui htmlexportconfig.kcfgc
-+KDE_DIST=xmlutils.h outputpage.ui kipiplugin_htmlexport.desktop htmlexportconfig.kcfg wizard.h theme.h plugin.h generator.h galleryinfo.h imagesettingspage.ui Makefile.in themepage.ui Makefile.am htmlexportconfig.kcfgc
-
- #>+ 6
- clean-ui:
-@@ -919,10 +955,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/Makefile.in
--- kipi-plugins/htmlexport/themes/Makefile.in
+++ kipi-plugins/htmlexport/themes/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/htmlexport/themes
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +204,9 @@
+@@ -204,6 +204,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -25965,395 +15590,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +267,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +340,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -329,40 +364,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = matrix snow simple
--subdir = kipi-plugins/htmlexport/themes
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -366,7 +369,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -375,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -387,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -404,9 +407,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -381,7 +429,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 \
-@@ -393,7 +447,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; \
+@@ -708,9 +711,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -401,7 +455,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)' ;; \
-@@ -422,7 +482,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 \
-@@ -433,14 +493,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -449,19 +501,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -471,10 +526,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -497,12 +553,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -516,7 +566,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -531,15 +581,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -549,7 +601,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -569,7 +620,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -591,6 +642,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -625,37 +678,42 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in
-+KDE_DIST=Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/Makefile.in
--- kipi-plugins/htmlexport/themes/matrix/Makefile.in
+++ kipi-plugins/htmlexport/themes/matrix/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -22,7 +22,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +38,30 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/htmlexport/themes/matrix
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(themedir)"
-+themeDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(theme_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +198,9 @@
+@@ -198,6 +198,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -26363,280 +15659,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +261,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +334,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -335,29 +364,53 @@
- template.xsl \
- bg.png
-
--subdir = kipi-plugins/htmlexport/themes/matrix
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(theme_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -366,7 +369,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -375,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -387,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/matrix/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -404,9 +407,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -368,23 +421,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--themeDATA_INSTALL = $(INSTALL_DATA)
- install-themeDATA: $(theme_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(themedir)
-+ test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
- @list='$(theme_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
-- $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
-+ $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
- done
-
- uninstall-themeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(theme_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
-- rm -f $(DESTDIR)$(themedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(themedir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -392,12 +444,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -411,7 +457,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -429,9 +475,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(themedir)
-+ for dir in "$(DESTDIR)$(themedir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -451,7 +498,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -472,6 +519,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -506,28 +555,37 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip install-themeDATA \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am uninstall-themeDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ install-themeDATA installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ uninstall uninstall-am uninstall-info-am uninstall-themeDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=matrix.desktop template.xsl Makefile.in style.css bg.png
-+KDE_DIST=matrix.desktop template.xsl Makefile.in style.css Makefile.am bg.png
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -580,9 +583,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/matrix/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/matrix/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/matrix/Makefile.in
--- kipi-plugins/htmlexport/themes/simple/Makefile.in
+++ kipi-plugins/htmlexport/themes/simple/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -22,7 +22,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +38,30 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/htmlexport/themes/simple
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(themedir)"
-+themeDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(theme_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +198,9 @@
+@@ -198,6 +198,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -26646,280 +15728,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +261,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +334,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -334,29 +363,53 @@
- style.css \
- template.xsl
-
--subdir = kipi-plugins/htmlexport/themes/simple
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(theme_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -365,7 +368,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -374,9 +377,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -386,9 +389,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/simple/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -403,9 +406,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -367,23 +420,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--themeDATA_INSTALL = $(INSTALL_DATA)
- install-themeDATA: $(theme_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(themedir)
-+ test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
- @list='$(theme_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
-- $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
-+ $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
- done
-
- uninstall-themeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(theme_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
-- rm -f $(DESTDIR)$(themedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(themedir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -391,12 +443,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -410,7 +456,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -428,9 +474,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(themedir)
-+ for dir in "$(DESTDIR)$(themedir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -450,7 +497,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -471,6 +518,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -505,28 +554,37 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip install-themeDATA \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am uninstall-themeDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ install-themeDATA installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ uninstall uninstall-am uninstall-info-am uninstall-themeDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=template.xsl simple.desktop Makefile.in style.css
-+KDE_DIST=template.xsl simple.desktop Makefile.in style.css Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -579,9 +582,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/simple/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/simple/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/simple/Makefile.in
--- kipi-plugins/htmlexport/themes/snow/Makefile.in
+++ kipi-plugins/htmlexport/themes/snow/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -22,7 +22,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +38,30 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/htmlexport/themes/snow
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(themedir)"
-+themeDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(theme_DATA)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +198,9 @@
+@@ -198,6 +198,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -26929,325 +15797,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +261,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +334,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -335,29 +364,53 @@
- template.xsl \
- previous.png next.png previous_disabled.png next_disabled.png
-
--subdir = kipi-plugins/htmlexport/themes/snow
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DATA = $(theme_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
+@@ -366,7 +369,7 @@
all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -375,9 +378,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -387,9 +390,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/snow/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -404,9 +407,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -368,23 +421,22 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--themeDATA_INSTALL = $(INSTALL_DATA)
- install-themeDATA: $(theme_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(themedir)
-+ test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
- @list='$(theme_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
-- $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
-+ $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
- done
-
- uninstall-themeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(theme_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
-- rm -f $(DESTDIR)$(themedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(themedir)/$$f"; \
- done
- tags: TAGS
- TAGS:
-@@ -392,12 +444,6 @@
- ctags: CTAGS
- CTAGS:
-
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -411,7 +457,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -429,9 +475,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(themedir)
-+ for dir in "$(DESTDIR)$(themedir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -451,7 +498,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -472,6 +519,8 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-@@ -506,28 +555,37 @@
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
-- dvi-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip install-themeDATA \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am uninstall-themeDATA
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ install-themeDATA installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ uninstall uninstall-am uninstall-info-am uninstall-themeDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=next.svg snow.desktop template.xsl previous.png next_disabled.png previous_disabled.png Makefile.in style.css next.png
-+KDE_DIST=next.svg snow.desktop template.xsl previous.png next_disabled.png previous_disabled.png Makefile.in style.css Makefile.am next.png
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -580,9 +583,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/htmlexport/themes/snow/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/htmlexport/themes/snow/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/htmlexport/themes/snow/Makefile.in
--- kipi-plugins/imagesgallery/Makefile.in
+++ kipi-plugins/imagesgallery/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,67 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/imagesgallery
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_imagesgallery_la_OBJECTS = plugin_imagesgallery.lo \
-+ imgallerydialog.lo imagesgallery.lo exifrestorer.lo
-+#>- kipiplugin_imagesgallery_la_OBJECTS = \
-+#>- $(am_kipiplugin_imagesgallery_la_OBJECTS)
-+#>+ 5
-+kipiplugin_imagesgallery_la_final_OBJECTS = kipiplugin_imagesgallery_la.all_cpp.lo
-+kipiplugin_imagesgallery_la_nofinal_OBJECTS = plugin_imagesgallery.lo \
-+ imgallerydialog.lo imagesgallery.lo exifrestorer.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +236,9 @@
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -27257,515 +15866,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +299,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +372,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -347,104 +414,78 @@
+@@ -417,7 +420,7 @@
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_imagesgallery.desktop
--subdir = kipi-plugins/imagesgallery
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_imagesgallery_la_OBJECTS = plugin_imagesgallery.lo \
-- imgallerydialog.lo imagesgallery.lo exifrestorer.lo
--#>- kipiplugin_imagesgallery_la_OBJECTS = \
--#>- $(am_kipiplugin_imagesgallery_la_OBJECTS)
--#>+ 5
--kipiplugin_imagesgallery_la_final_OBJECTS = kipiplugin_imagesgallery_la.all_cpp.lo
--kipiplugin_imagesgallery_la_nofinal_OBJECTS = plugin_imagesgallery.lo \
-- imgallerydialog.lo imagesgallery.lo exifrestorer.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_imagesgallery_la_OBJECTS = $(kipiplugin_imagesgallery_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/imagesgallery.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/imgallerydialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_imagesgallery.Plo
--#>+ 8
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_imagesgallery_la.all_cpp.P ./$(DEPDIR)/exifrestorer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagesgallery.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imgallerydialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_imagesgallery.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagesgallery.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imgallerydialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_imagesgallery.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
--SOURCES = $(kipiplugin_imagesgallery_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -426,9 +429,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -438,9 +441,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/imagesgallery/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -455,9 +458,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -455,7 +496,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_imagesgallery_la_LDFLAGS) $(kipiplugin_imagesgallery_la_OBJECTS) $(kipiplugin_imagesgallery_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -466,37 +507,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_imagesgallery.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -507,33 +536,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -542,6 +562,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -553,10 +574,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -579,12 +601,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -598,7 +614,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -616,9 +632,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -638,7 +655,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -663,13 +680,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -705,8 +726,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -759,7 +780,7 @@
- -rm -f imagesgallery.moc imgallerydialog.moc plugin_imagesgallery.moc
-
- #>+ 2
--KDE_DIST=imgallerydialog.h kipiplugin_imagesgallery.desktop jpegsection.h Makefile.in exifrestorer.h plugin_imagesgallery.h actions.h imagesgallery.h
-+KDE_DIST=imgallerydialog.h kipiplugin_imagesgallery.desktop jpegsection.h Makefile.in exifrestorer.h plugin_imagesgallery.h actions.h Makefile.am imagesgallery.h
-
- #>+ 3
- clean-closures:
-@@ -768,10 +789,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -796,9 +799,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/imagesgallery/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/imagesgallery/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/imagesgallery/Makefile.in
--- kipi-plugins/jpeglossless/Makefile.in
+++ kipi-plugins/jpeglossless/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,74 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/jpeglossless
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
-+ jpegtransform.lo actionthread.lo utils.lo transupp.lo \
-+ imagerotate.lo convert2grayscale.lo imageflip.lo
-+#>- kipiplugin_jpeglossless_la_OBJECTS = \
-+#>- $(am_kipiplugin_jpeglossless_la_OBJECTS)
-+#>+ 3
-+kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
-+ jpegtransform.lo actionthread.lo utils.lo transupp.lo \
-+ imagerotate.lo convert2grayscale.lo imageflip.lo
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +243,9 @@
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -27775,589 +15935,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +306,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +379,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -339,128 +413,88 @@
+@@ -426,7 +429,7 @@
- # Install this plugin in the KDE modules directory
- kde_module_LTLIBRARIES = kipiplugin_jpeglossless.la
--
- kipiplugin_jpeglossless_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIF_LIBS_DEP)
--
- kipiplugin_jpeglossless_la_SOURCES = plugin_jpeglossless.cpp jpegtransform.cpp \
- actionthread.cpp utils.cpp transupp.c \
- imagerotate.cpp convert2grayscale.cpp imageflip.cpp
-
--
- kipiplugin_jpeglossless_la_LIBADD = -ljpeg -lMagick++ $(LIBKEXIF_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_jpeglossless.desktop
--
- kipijpeglosslessicondir = $(kde_datadir)/kipiplugin_jpeglossless/icons
- kipijpeglosslessicon_ICON = AUTO
--subdir = kipi-plugins/jpeglossless
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
-- jpegtransform.lo actionthread.lo utils.lo transupp.lo \
-- imagerotate.lo convert2grayscale.lo imageflip.lo
--#>- kipiplugin_jpeglossless_la_OBJECTS = \
--#>- $(am_kipiplugin_jpeglossless_la_OBJECTS)
--#>+ 3
--kipiplugin_jpeglossless_la_OBJECTS = plugin_jpeglossless.lo \
-- jpegtransform.lo actionthread.lo utils.lo transupp.lo \
-- imagerotate.lo convert2grayscale.lo imageflip.lo
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/actionthread.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/convert2grayscale.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/imageflip.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/imagerotate.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/jpegtransform.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_jpeglossless.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo ./$(DEPDIR)/utils.Plo
--#>+ 7
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/actionthread.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/convert2grayscale.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageflip.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagerotate.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jpegtransform.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_jpeglossless.Plo \
-- at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/transupp.Plo ./$(DEPDIR)/utils.Plo
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_jpeglossless_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -435,9 +438,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -447,9 +450,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/jpeglossless/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -464,9 +467,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -471,7 +505,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_jpeglossless_la_LDFLAGS) $(kipiplugin_jpeglossless_la_OBJECTS) $(kipiplugin_jpeglossless_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -486,70 +520,46 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -560,33 +570,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -595,6 +596,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -606,10 +608,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -632,12 +635,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -651,7 +648,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -669,9 +666,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -691,7 +689,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -716,13 +714,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde-icons install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: install-kde-icons \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -761,8 +763,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -800,7 +802,7 @@
- -rm -f plugin_jpeglossless.moc
-
- #>+ 2
--KDE_DIST=jpegtransform.h kipiplugin_jpeglossless.desktop hi32-action-flip_image.png transupp.h convert2grayscale.h jinclude.h actionthread.h plugin_jpeglossless.h utils.h imagerotate.h Makefile.in imageflip.h hi32-action-grayscaleconvert.png actions.h jpegint.h mtqueue.h libjpeg62.README
-+KDE_DIST=jpegtransform.h kipiplugin_jpeglossless.desktop hi32-action-flip_image.png transupp.h convert2grayscale.h jinclude.h actionthread.h plugin_jpeglossless.h utils.h imagerotate.h Makefile.in imageflip.h hi32-action-grayscaleconvert.png actions.h jpegint.h mtqueue.h Makefile.am libjpeg62.README
-
- #>+ 3
- clean-closures:
-@@ -819,10 +821,19 @@
- -rm -f $(DESTDIR)$(kipijpeglosslessicondir)/hicolor/32x32/actions/flip_image.png
- -rm -f $(DESTDIR)$(kipijpeglosslessicondir)/hicolor/32x32/actions/grayscaleconvert.png
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -828,9 +831,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/jpeglossless/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/jpeglossless/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/jpeglossless/Makefile.in
--- kipi-plugins/kameraklient/Makefile.in
+++ kipi-plugins/kameraklient/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,79 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/kameraklient
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_kameraklient_la_OBJECTS = kameraklient.lo \
-+ camerafolderitem.lo camerafolderview.lo cameraiconitem.lo \
-+ cameraiconview.lo cameralist.lo cameraselection.lo \
-+ cameratype.lo cameraui.lo dmessagebox.lo gpcamera.lo \
-+ gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
-+ gpfileiteminfo.lo gpfileiteminfodlg.lo gpiface.lo \
-+ gpmessages.lo gpstatus.lo savefiledialog.lo setupcamera.lo \
-+ thumbitem.lo thumbview.lo
-+#>- kipiplugin_kameraklient_la_OBJECTS = \
-+#>- $(am_kipiplugin_kameraklient_la_OBJECTS)
-+#>+ 11
-+kipiplugin_kameraklient_la_final_OBJECTS = kipiplugin_kameraklient_la.all_cpp.lo
-+kipiplugin_kameraklient_la_nofinal_OBJECTS = kameraklient.lo \
-+ camerafolderitem.lo camerafolderview.lo cameraiconitem.lo \
-+ cameraiconview.lo cameralist.lo cameraselection.lo \
-+ cameratype.lo cameraui.lo dmessagebox.lo gpcamera.lo \
-+ gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
-+ gpfileiteminfo.lo gpfileiteminfodlg.lo gpiface.lo \
-+ gpmessages.lo gpstatus.lo savefiledialog.lo setupcamera.lo \
-+ thumbitem.lo thumbview.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +248,9 @@
+@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -28367,597 +16004,135 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +311,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +384,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -329,18 +408,12 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- INCLUDES = $(GPHOTO_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
--
- #>- METASOURCES = AUTO
--
- kde_module_LTLIBRARIES = kipiplugin_kameraklient.la
- kipiplugin_kameraklient_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
--
- kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_kameraklient_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_kameraklient.desktop
--
- kipiplugin_kameraklient_la_SOURCES = kameraklient.cpp camerafolderitem.cpp camerafolderview.cpp \
- cameraiconitem.cpp cameraiconview.cpp cameralist.cpp \
- cameraselection.cpp cameratype.cpp cameraui.cpp \
-@@ -350,166 +423,79 @@
- gpstatus.cpp savefiledialog.cpp setupcamera.cpp \
- thumbitem.cpp thumbview.cpp
+@@ -427,7 +430,7 @@
--
- kipiplugin_kameraklientdir = $(kde_datadir)/kipiplugin_kameraklient
--subdir = kipi-plugins/kameraklient
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_kameraklient_la_OBJECTS = kameraklient.lo \
-- camerafolderitem.lo camerafolderview.lo cameraiconitem.lo \
-- cameraiconview.lo cameralist.lo cameraselection.lo \
-- cameratype.lo cameraui.lo dmessagebox.lo gpcamera.lo \
-- gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
-- gpfileiteminfo.lo gpfileiteminfodlg.lo gpiface.lo gpmessages.lo \
-- gpstatus.lo savefiledialog.lo setupcamera.lo thumbitem.lo \
-- thumbview.lo
--#>- kipiplugin_kameraklient_la_OBJECTS = \
--#>- $(am_kipiplugin_kameraklient_la_OBJECTS)
--#>+ 11
--kipiplugin_kameraklient_la_final_OBJECTS = kipiplugin_kameraklient_la.all_cpp.lo
--kipiplugin_kameraklient_la_nofinal_OBJECTS = kameraklient.lo \
-- camerafolderitem.lo camerafolderview.lo cameraiconitem.lo \
-- cameraiconview.lo cameralist.lo cameraselection.lo \
-- cameratype.lo cameraui.lo dmessagebox.lo gpcamera.lo \
-- gpcontroller.lo gpeventfilter.lo gpfileitemcontainer.lo \
-- gpfileiteminfo.lo gpfileiteminfodlg.lo gpiface.lo gpmessages.lo \
-- gpstatus.lo savefiledialog.lo setupcamera.lo thumbitem.lo \
-- thumbview.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_kameraklient_la_OBJECTS = $(kipiplugin_kameraklient_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/camerafolderitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/camerafolderview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/cameraiconitem.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/cameraiconview.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/cameralist.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/cameraselection.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/cameratype.Plo ./$(DEPDIR)/cameraui.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/dmessagebox.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpcamera.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpcontroller.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpeventfilter.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpfileitemcontainer.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpfileiteminfo.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpfileiteminfodlg.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpiface.Plo ./$(DEPDIR)/gpmessages.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/gpstatus.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/kameraklient.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/savefiledialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/setupcamera.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/thumbitem.Plo ./$(DEPDIR)/thumbview.Plo
--#>+ 40
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_kameraklient_la.all_cpp.P ./$(DEPDIR)/camerafolderitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/camerafolderview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameraiconitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameraiconview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameralist.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameraselection.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameratype.Plo ./$(DEPDIR)/cameraui.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dmessagebox.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpcamera.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpcontroller.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpeventfilter.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpfileitemcontainer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpfileiteminfo.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpfileiteminfodlg.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpiface.Plo ./$(DEPDIR)/gpmessages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpstatus.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kameraklient.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/savefiledialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/setupcamera.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbitem.Plo ./$(DEPDIR)/thumbview.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/camerafolderitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/camerafolderview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameraiconitem.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameraiconview.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameralist.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameraselection.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cameratype.Plo ./$(DEPDIR)/cameraui.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dmessagebox.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpcamera.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpcontroller.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpeventfilter.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpfileitemcontainer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpfileiteminfo.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpfileiteminfodlg.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpiface.Plo ./$(DEPDIR)/gpmessages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/gpstatus.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kameraklient.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/savefiledialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/setupcamera.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/thumbitem.Plo ./$(DEPDIR)/thumbview.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_kameraklient_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -436,9 +439,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -448,9 +451,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/kameraklient/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -465,9 +468,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
+@@ -909,9 +912,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/kameraklient/Makefile.in
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -520,7 +506,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_kameraklient_la_LDFLAGS) $(kipiplugin_kameraklient_la_OBJECTS) $(kipiplugin_kameraklient_la_LIBADD) $(LIBS)
+--- kipi-plugins/Makefile.in
++++ kipi-plugins/Makefile.in
+@@ -217,6 +217,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAGICK_CONFIG = @MAGICK_CONFIG@
++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
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
+ .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*) \
+@@ -407,9 +410,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu kipi-plugins/Makefile
++#>- $(AUTOMAKE) --foreign kipi-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -419,9 +422,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -436,9 +439,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- distclean-compile:
- -rm -f *.tab.c
-@@ -550,37 +536,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thumbview.Plo at am__quote@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
- -rm -f *.lo
-@@ -591,33 +565,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
+@@ -770,9 +773,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/Makefile
++ $(AUTOMAKE) --foreign kipi-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kipi-plugins/Makefile.in
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -626,6 +591,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -637,10 +603,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -663,12 +630,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -682,7 +643,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -700,9 +661,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -722,7 +684,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -747,13 +709,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -789,8 +755,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -927,7 +893,7 @@
- -rm -f cameralist.moc dmessagebox.moc setupcamera.moc cameraselection.moc gpfileitemcontainer.moc gpeventfilter.moc gpcontroller.moc kameraklient.moc cameraui.moc camerafolderview.moc gpstatus.moc thumbview.moc cameraiconview.moc savefiledialog.moc gpmessages.moc
-
- #>+ 2
--KDE_DIST=hi48-action-documents.png hi22-action-multimedia.png hi16-action-pictures.png camerafolderitem.h hi48-action-sound.png gpiface.h hi32-action-new.png gpstatus.h gpfileiteminfo.h gpcommand.h hi22-action-sound.png cameraiconitem.h hi16-action-documents.png hi48-action-pictures.png thumbview.h hi32-action-sound.png cameraiconview.h kipiplugin_kameraklient.desktop gpcontroller.h thumbitem.h gpfileiteminfodlg.h hi16-action-new.png hi22-action-documents.png cameraselection.h savefiledialog.h hi16-action-generic.png hi48-action-new.png hi48-action-generic.png hi16-action-multimedia.png setupcamera.h hi16-action-sound.png dmessagebox.h hi32-action-generic.png gpcamera.h camerafolderview.h hi32-action-pictures.png cameratype.h hi48-action-multimedia.png gpmessages.h hi32-action-multimedia.png mtlist.h kameraklient.h Makefile.in cameralist.h hi22-action-generic.png cameraui.h hi22-action-pictures.png hi22-action-new.png hi32-action-documents.png gpeventfilter.h gpevents.h gpfileitemcontainer.h mtqueue.h
-+KDE_DIST=hi48-action-documents.png hi22-action-multimedia.png hi16-action-pictures.png camerafolderitem.h hi48-action-sound.png gpiface.h hi32-action-new.png gpstatus.h gpfileiteminfo.h gpcommand.h hi22-action-sound.png cameraiconitem.h hi16-action-documents.png hi48-action-pictures.png thumbview.h hi32-action-sound.png cameraiconview.h kipiplugin_kameraklient.desktop gpcontroller.h thumbitem.h gpfileiteminfodlg.h hi16-action-new.png hi22-action-documents.png cameraselection.h savefiledialog.h hi16-action-generic.png hi48-action-new.png hi48-action-generic.png hi16-action-multimedia.png setupcamera.h hi16-action-sound.png dmessagebox.h hi32-action-generic.png gpcamera.h camerafolderview.h hi32-action-pictures.png cameratype.h hi48-action-multimedia.png gpmessages.h hi32-action-multimedia.png mtlist.h kameraklient.h Makefile.in cameralist.h hi22-action-generic.png cameraui.h hi22-action-pictures.png hi22-action-new.png hi32-action-documents.png gpeventfilter.h gpevents.h gpfileitemcontainer.h mtqueue.h Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -936,10 +902,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/kameraklient/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign kipi-plugins/kameraklient/Makefile
- cd $(top_srcdir) && perl admin/am_edit kipi-plugins/kameraklient/Makefile.in
-
-
--- kipi-plugins/mpegencoder/Makefile.in
+++ kipi-plugins/mpegencoder/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +24,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +40,74 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/mpegencoder
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_mpegencoder_la_OBJECTS = plugin_mpegencoder.lo \
-+ kimg2mpg.lo kshowdebuggingoutput.lo optionsdialog.lo \
-+ checkbinprog.lo
-+#>- kipiplugin_mpegencoder_la_OBJECTS = \
-+#>- $(am_kipiplugin_mpegencoder_la_OBJECTS)
-+#>+ 6
-+kipiplugin_mpegencoder_la_final_OBJECTS = kipiplugin_mpegencoder_la.all_cpp.lo
-+kipiplugin_mpegencoder_la_nofinal_OBJECTS = plugin_mpegencoder.lo \
-+ kimg2mpg.lo kshowdebuggingoutput.lo optionsdialog.lo \
-+ checkbinprog.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_final_OBJECTS)
-+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+SCRIPTS = $(bin_SCRIPTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
-+man1dir = $(mandir)/man1
-+NROFF = nroff
-+MANS = $(man_MANS)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +244,9 @@
+@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -28967,592 +16142,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +307,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +380,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -352,112 +427,78 @@
- ####### This script name should probably be more 'namespaced'. Think about distros putting everything in /usr/bin...
- bin_SCRIPTS = images2mpg
- man_MANS = images2mpg.1
--subdir = kipi-plugins/mpegencoder
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_mpegencoder_la_OBJECTS = plugin_mpegencoder.lo kimg2mpg.lo \
-- kshowdebuggingoutput.lo optionsdialog.lo checkbinprog.lo
--#>- kipiplugin_mpegencoder_la_OBJECTS = \
--#>- $(am_kipiplugin_mpegencoder_la_OBJECTS)
--#>+ 5
--kipiplugin_mpegencoder_la_final_OBJECTS = kipiplugin_mpegencoder_la.all_cpp.lo
--kipiplugin_mpegencoder_la_nofinal_OBJECTS = plugin_mpegencoder.lo kimg2mpg.lo \
-- kshowdebuggingoutput.lo optionsdialog.lo checkbinprog.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_mpegencoder_la_OBJECTS = $(kipiplugin_mpegencoder_la_final_OBJECTS)
--SCRIPTS = $(bin_SCRIPTS)
--
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/checkbinprog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimg2mpg.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshowdebuggingoutput.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/optionsdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_mpegencoder.Plo
--#>+ 10
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_mpegencoder_la.all_cpp.P ./$(DEPDIR)/checkbinprog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimg2mpg.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshowdebuggingoutput.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/optionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_mpegencoder.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/checkbinprog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimg2mpg.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshowdebuggingoutput.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/optionsdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_mpegencoder.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
--
--NROFF = nroff
--MANS = $(man_MANS)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_mpegencoder_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -439,9 +442,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -451,9 +454,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/mpegencoder/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -468,9 +471,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -466,16 +507,15 @@
- @KDE_USE_CLOSURE_TRUE at kipiplugin_mpegencoder.la: kipiplugin_mpegencoder.la.closure $(kipiplugin_mpegencoder_la_OBJECTS) $(kipiplugin_mpegencoder_la_DEPENDENCIES)
- @KDE_USE_CLOSURE_FALSE at kipiplugin_mpegencoder.la: $(kipiplugin_mpegencoder_la_OBJECTS) $(kipiplugin_mpegencoder_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_mpegencoder_la_LDFLAGS) $(kipiplugin_mpegencoder_la_OBJECTS) $(kipiplugin_mpegencoder_la_LIBADD) $(LIBS)
--binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(bindir)
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-- echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
-- $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
-+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
-
-@@ -483,12 +523,12 @@
- @$(NORMAL_UNINSTALL)
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-- rm -f $(DESTDIR)$(bindir)/$$f; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -500,37 +540,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_mpegencoder.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -541,11 +569,9 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--
--man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-+ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -564,8 +590,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-@@ -585,36 +611,27 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-- rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -623,6 +640,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -634,10 +652,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -660,12 +679,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -679,7 +692,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -697,9 +710,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -719,7 +733,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -744,15 +758,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
--#>- install-man
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA install-man
- #>+ 2
--install-data-am: install-kde_servicesDATA \
-- install-man
-+install-data-am: \
-+ install-kde_servicesDATA install-man
-
- #>- install-exec-am: install-binSCRIPTS
- #>+ 1
-@@ -791,17 +807,18 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-binSCRIPTS install-data install-data-am \
-- install-exec install-exec-am install-info install-info-am \
-- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-- install-man install-man1 install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-compile \
-- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags uninstall uninstall-am uninstall-binSCRIPTS \
-- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-- uninstall-kde_servicesDATA uninstall-man uninstall-man1
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-binSCRIPTS install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-kde_moduleLTLIBRARIES \
-+ install-kde_servicesDATA install-man install-man1 \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-binSCRIPTS uninstall-info-am \
-+ uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
-+ uninstall-man uninstall-man1
-
-
- # i18n translation messages
-@@ -860,7 +877,7 @@
- -rm -f plugin_mpegencoder.moc kimg2mpg.moc kshowdebuggingoutput.moc checkbinprog.moc optionsdialog.moc
-
- #>+ 2
--KDE_DIST=optionsdialog.h checkbinprog.h kimg2mpg.h plugin_mpegencoder.h images2mpg.1 kipiplugin_mpegencoder.desktop images2mpg kshowdebuggingoutput.h Makefile.in
-+KDE_DIST=optionsdialog.h checkbinprog.h kimg2mpg.h plugin_mpegencoder.h images2mpg.1 kipiplugin_mpegencoder.desktop images2mpg kshowdebuggingoutput.h Makefile.in Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -869,10 +886,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -893,9 +896,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/mpegencoder/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/mpegencoder/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/mpegencoder/Makefile.in
--- kipi-plugins/printwizard/Makefile.in
+++ kipi-plugins/printwizard/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,67 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/printwizard
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_printwizard_la_OBJECTS = plugin_printwizard.lo \
-+ frmprintwizard.lo cropframe.lo tphoto.lo utils.lo
-+#>- kipiplugin_printwizard_la_OBJECTS = \
-+#>- $(am_kipiplugin_printwizard_la_OBJECTS)
-+#>+ 5
-+kipiplugin_printwizard_la_final_OBJECTS = kipiplugin_printwizard_la.all_cpp.lo
-+kipiplugin_printwizard_la_nofinal_OBJECTS = plugin_printwizard.lo \
-+ frmprintwizard.lo cropframe.lo tphoto.lo utils.lo frmprintwizardbase.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_printwizard_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_printwizard_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +236,9 @@
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -29562,528 +16211,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +299,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +372,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -340,108 +407,80 @@
+@@ -412,7 +415,7 @@
- #LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
- kipiplugin_printwizard_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_printwizard_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_printwizard.desktop
--subdir = kipi-plugins/printwizard
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_printwizard_la_OBJECTS = plugin_printwizard.lo \
-- frmprintwizard.lo cropframe.lo tphoto.lo utils.lo
--#>- kipiplugin_printwizard_la_OBJECTS = \
--#>- $(am_kipiplugin_printwizard_la_OBJECTS)
--#>+ 5
--kipiplugin_printwizard_la_final_OBJECTS = kipiplugin_printwizard_la.all_cpp.lo
--kipiplugin_printwizard_la_nofinal_OBJECTS = plugin_printwizard.lo \
-- frmprintwizard.lo cropframe.lo tphoto.lo utils.lo frmprintwizardbase.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_printwizard_la_OBJECTS = $(kipiplugin_printwizard_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cropframe.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/frmprintwizard.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_printwizard.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/tphoto.Plo ./$(DEPDIR)/utils.Plo
--#>+ 8
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/frmprintwizardbase.P $(DEPDIR)/kipiplugin_printwizard_la.all_cpp.P ./$(DEPDIR)/cropframe.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/frmprintwizard.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_printwizard.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tphoto.Plo ./$(DEPDIR)/utils.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/frmprintwizardbase.P ./$(DEPDIR)/cropframe.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/frmprintwizard.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_printwizard.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tphoto.Plo ./$(DEPDIR)/utils.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_printwizard_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_printwizard_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -421,9 +424,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -433,9 +436,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/printwizard/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -450,9 +453,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -452,7 +491,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_printwizard_la_LDFLAGS) $(kipiplugin_printwizard_la_OBJECTS) $(kipiplugin_printwizard_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -464,37 +503,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utils.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -505,33 +532,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -540,6 +558,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -551,10 +570,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -577,12 +597,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -596,7 +610,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -614,9 +628,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -636,7 +651,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -661,13 +676,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -703,8 +722,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -756,7 +775,7 @@
- -rm -f plugin_printwizard.moc cropframe.moc frmprintwizard.moc
-
- #>+ 2
--KDE_DIST=frmprintwizardbase.ui cropframe.h kipiplugin_printwizard.desktop utils.h Makefile.in tphoto.h frmprintwizard.h plugin_printwizard.h
-+KDE_DIST=frmprintwizardbase.ui cropframe.h kipiplugin_printwizard.desktop utils.h Makefile.in tphoto.h frmprintwizard.h Makefile.am plugin_printwizard.h
-
- #>+ 4
- clean-ui:
-@@ -770,10 +789,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -796,9 +799,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/printwizard/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/printwizard/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/printwizard/Makefile.in
--- kipi-plugins/rawconverter/Makefile.in
+++ kipi-plugins/rawconverter/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,8 @@
-
- @SET_MAKE@
-
-+
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +24,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +40,82 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+bin_PROGRAMS = kipidcrawclient$(EXEEXT)
-+subdir = kipi-plugins/rawconverter
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
-+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_rawconverter_la_OBJECTS = plugin_rawconverter.lo \
-+ batchdialog.lo singledialog.lo previewwidget.lo \
-+ processcontroller.lo
-+#>- kipiplugin_rawconverter_la_OBJECTS = \
-+#>- $(am_kipiplugin_rawconverter_la_OBJECTS)
-+#>+ 6
-+kipiplugin_rawconverter_la_final_OBJECTS = kipiplugin_rawconverter_la.all_cpp.lo
-+kipiplugin_rawconverter_la_nofinal_OBJECTS = plugin_rawconverter.lo \
-+ batchdialog.lo singledialog.lo previewwidget.lo \
-+ processcontroller.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_rawconverter_la_OBJECTS = $(kipiplugin_rawconverter_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_rawconverter_la_OBJECTS = $(kipiplugin_rawconverter_la_final_OBJECTS)
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_kipidcrawclient_OBJECTS = dcrawprocess.$(OBJEXT)
-+#>- kipidcrawclient_OBJECTS = $(am_kipidcrawclient_OBJECTS)
-+#>+ 1
-+kipidcrawclient_OBJECTS = dcrawprocess.$(OBJEXT)
-+kipidcrawclient_LDADD = $(LDADD)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_rawconverter_la_SOURCES) \
-+ $(kipidcrawclient_SOURCES)
-+DIST_SOURCES = $(kipiplugin_rawconverter_la_SOURCES) \
-+ $(kipidcrawclient_SOURCES)
-+man1dir = $(mandir)/man1
-+NROFF = nroff
-+MANS = $(man_MANS)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +252,9 @@
+@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -30093,630 +16280,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +315,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +388,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -345,140 +428,86 @@
+@@ -439,7 +442,7 @@
- # LD flags for the plugin
- kipiplugin_rawconverter_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
--# binary
--bin_PROGRAMS = kipidcrawclient
--
- kipidcrawclient_SOURCES = dcrawprocess.cpp
--
- kipidcrawclient_LDFLAGS = -lm -ljpeg -lpng $(LIB_TIFF) $(all_libraries)
-
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_rawconverter.desktop
--
- kipirawconvertericondir = $(kde_datadir)/kipiplugin_rawconverter/icons
- kipirawconvertericon_ICON = AUTO
--
- man_MANS = kipidcrawclient.1
--subdir = kipi-plugins/rawconverter
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_rawconverter_la_OBJECTS = plugin_rawconverter.lo \
-- batchdialog.lo singledialog.lo previewwidget.lo \
-- processcontroller.lo
--#>- kipiplugin_rawconverter_la_OBJECTS = \
--#>- $(am_kipiplugin_rawconverter_la_OBJECTS)
--#>+ 6
--kipiplugin_rawconverter_la_final_OBJECTS = kipiplugin_rawconverter_la.all_cpp.lo
--kipiplugin_rawconverter_la_nofinal_OBJECTS = plugin_rawconverter.lo \
-- batchdialog.lo singledialog.lo previewwidget.lo \
-- processcontroller.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_rawconverter_la_OBJECTS = $(kipiplugin_rawconverter_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_rawconverter_la_OBJECTS = $(kipiplugin_rawconverter_la_final_OBJECTS)
--bin_PROGRAMS = kipidcrawclient$(EXEEXT)
--PROGRAMS = $(bin_PROGRAMS)
--
--am_kipidcrawclient_OBJECTS = dcrawprocess.$(OBJEXT)
--#>- kipidcrawclient_OBJECTS = $(am_kipidcrawclient_OBJECTS)
--#>+ 1
--kipidcrawclient_OBJECTS = dcrawprocess.$(OBJEXT)
--kipidcrawclient_LDADD = $(LDADD)
--kipidcrawclient_DEPENDENCIES =
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/batchdialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcrawprocess.Po \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_rawconverter.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/previewwidget.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/processcontroller.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/singledialog.Plo
--#>+ 12
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_rawconverter_la.all_cpp.P ./$(DEPDIR)/batchdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcrawprocess.Po \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_rawconverter.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewwidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/processcontroller.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/singledialog.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/batchdialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcrawprocess.Po \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_rawconverter.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewwidget.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/processcontroller.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/singledialog.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_rawconverter_la_SOURCES) \
-- $(kipidcrawclient_SOURCES)
--
--NROFF = nroff
--MANS = $(man_MANS)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_rawconverter_la_SOURCES) $(kipidcrawclient_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -448,9 +451,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -460,9 +463,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/rawconverter/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -487,18 +516,17 @@
- @KDE_USE_CLOSURE_TRUE at kipiplugin_rawconverter.la: kipiplugin_rawconverter.la.closure $(kipiplugin_rawconverter_la_OBJECTS) $(kipiplugin_rawconverter_la_DEPENDENCIES)
- @KDE_USE_CLOSURE_FALSE at kipiplugin_rawconverter.la: $(kipiplugin_rawconverter_la_OBJECTS) $(kipiplugin_rawconverter_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_rawconverter_la_LDFLAGS) $(kipiplugin_rawconverter_la_OBJECTS) $(kipiplugin_rawconverter_la_LIBADD) $(LIBS)
--binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(bindir)
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -506,8 +534,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-- rm -f $(DESTDIR)$(bindir)/$$f; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
- clean-binPROGRAMS:
-@@ -521,7 +549,7 @@
- $(CXXLINK) $(kipidcrawclient_LDFLAGS) $(kipidcrawclient_OBJECTS) $(kipidcrawclient_LDADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -534,37 +562,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/singledialog.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -575,11 +591,9 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--
--man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-+ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -598,8 +612,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-@@ -619,36 +633,27 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-- rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -657,6 +662,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -668,10 +674,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -694,12 +701,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -713,7 +714,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -731,9 +732,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -753,7 +755,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -778,15 +780,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
--#>- install-man
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA install-man
- #>+ 2
--install-data-am: install-kde-icons install-kde_servicesDATA \
-- install-man
-+install-data-am: install-kde-icons \
-+ install-kde_servicesDATA install-man
-
- #>- install-exec-am: install-binPROGRAMS
- #>+ 1
-@@ -828,18 +832,19 @@
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-kde_moduleLTLIBRARIES clean-libtool ctags \
-- distclean distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-binPROGRAMS install-data install-data-am \
-- install-exec install-exec-am install-info install-info-am \
-- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-- install-man install-man1 install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-compile \
-- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags uninstall uninstall-am uninstall-binPROGRAMS \
-- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-- uninstall-kde_servicesDATA uninstall-man uninstall-man1
-+ distclean distclean-compile distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-binPROGRAMS \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-kde_moduleLTLIBRARIES \
-+ install-kde_servicesDATA install-man install-man1 \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-binPROGRAMS uninstall-info-am \
-+ uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
-+ uninstall-man uninstall-man1
-
-
- messages: rc.cpp
-@@ -897,7 +902,7 @@
- -rm -f processcontroller.moc batchdialog.moc plugin_rawconverter.moc previewwidget.moc singledialog.moc
-
- #>+ 2
--KDE_DIST=singledialog.h hi32-action-rawconverterbatch.png kipiplugin_rawconverter.desktop kipidcrawclient.1 hi32-action-rawconvertersingle.png plugin_rawconverter.h previewwidget.h processcontroller.h clistviewitem.h Makefile.in batchdialog.h
-+KDE_DIST=singledialog.h hi32-action-rawconverterbatch.png kipiplugin_rawconverter.desktop kipidcrawclient.1 hi32-action-rawconvertersingle.png plugin_rawconverter.h previewwidget.h processcontroller.h clistviewitem.h Makefile.in batchdialog.h Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -916,10 +921,19 @@
- -rm -f $(DESTDIR)$(kipirawconvertericondir)/hicolor/32x32/actions/rawconvertersingle.png
- -rm -f $(DESTDIR)$(kipirawconvertericondir)/hicolor/32x32/actions/rawconverterbatch.png
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -928,9 +931,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/rawconverter/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/rawconverter/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/rawconverter/Makefile.in
--- kipi-plugins/sendimages/Makefile.in
+++ kipi-plugins/sendimages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,69 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/sendimages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_sendimages_la_OBJECTS = plugin_sendimages.lo \
-+ sendimagesdialog.lo listimageserrordialog.lo sendimages.lo \
-+ exifrestorer.lo
-+#>- kipiplugin_sendimages_la_OBJECTS = \
-+#>- $(am_kipiplugin_sendimages_la_OBJECTS)
-+#>+ 6
-+kipiplugin_sendimages_la_final_OBJECTS = kipiplugin_sendimages_la.all_cpp.lo
-+kipiplugin_sendimages_la_nofinal_OBJECTS = plugin_sendimages.lo \
-+ sendimagesdialog.lo listimageserrordialog.lo sendimages.lo \
-+ exifrestorer.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_sendimages_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_sendimages_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +238,9 @@
+@@ -238,6 +238,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -30726,518 +16349,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +301,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +374,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -348,109 +417,78 @@
+@@ -420,7 +423,7 @@
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_sendimages.desktop
--subdir = kipi-plugins/sendimages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_sendimages_la_OBJECTS = plugin_sendimages.lo \
-- sendimagesdialog.lo listimageserrordialog.lo sendimages.lo \
-- exifrestorer.lo
--#>- kipiplugin_sendimages_la_OBJECTS = \
--#>- $(am_kipiplugin_sendimages_la_OBJECTS)
--#>+ 6
--kipiplugin_sendimages_la_final_OBJECTS = kipiplugin_sendimages_la.all_cpp.lo
--kipiplugin_sendimages_la_nofinal_OBJECTS = plugin_sendimages.lo \
-- sendimagesdialog.lo listimageserrordialog.lo sendimages.lo \
-- exifrestorer.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_sendimages_la_OBJECTS = $(kipiplugin_sendimages_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/listimageserrordialog.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_sendimages.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/sendimages.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/sendimagesdialog.Plo
--#>+ 10
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_sendimages_la.all_cpp.P ./$(DEPDIR)/exifrestorer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/listimageserrordialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_sendimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sendimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sendimagesdialog.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/exifrestorer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/listimageserrordialog.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_sendimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sendimages.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sendimagesdialog.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_sendimages_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_sendimages_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -429,9 +432,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -441,9 +444,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/sendimages/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -458,9 +461,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -461,7 +499,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_sendimages_la_LDFLAGS) $(kipiplugin_sendimages_la_OBJECTS) $(kipiplugin_sendimages_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -473,37 +511,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sendimagesdialog.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -514,33 +540,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -549,6 +566,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -560,10 +578,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -586,12 +605,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -605,7 +618,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -623,9 +636,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -645,7 +659,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -670,13 +684,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -712,8 +730,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -773,7 +791,7 @@
- -rm -f listimageserrordialog.moc sendimages.moc sendimagesdialog.moc plugin_sendimages.moc
-
- #>+ 2
--KDE_DIST=kipiplugin_sendimages.desktop jpegsection.h actions.h sendimages.h plugin_sendimages.h listimageserrordialog.h Makefile.in exifrestorer.h sendimagesdialog.h
-+KDE_DIST=kipiplugin_sendimages.desktop jpegsection.h actions.h sendimages.h plugin_sendimages.h listimageserrordialog.h Makefile.in exifrestorer.h sendimagesdialog.h Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -782,10 +800,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -807,9 +810,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/sendimages/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/sendimages/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/sendimages/Makefile.in
--- kipi-plugins/simpleviewerexport/Makefile.in
+++ kipi-plugins/simpleviewerexport/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,72 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/simpleviewerexport
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)" \
-+ "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)" \
-+ "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_simpleviewer_la_OBJECTS = plugin_simpleviewer.lo \
-+ svedialog.lo simpleviewerexport.lo firstrundlg.lo
-+#>- kipiplugin_simpleviewer_la_OBJECTS = \
-+#>- $(am_kipiplugin_simpleviewer_la_OBJECTS)
-+#>+ 5
-+kipiplugin_simpleviewer_la_final_OBJECTS = kipiplugin_simpleviewer_la.all_cpp.lo
-+kipiplugin_simpleviewer_la_nofinal_OBJECTS = plugin_simpleviewer.lo \
-+ svedialog.lo simpleviewerexport.lo firstrundlg.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+kipiplugin_simpleviewer_svDATA_INSTALL = $(INSTALL_DATA)
-+kipiplugin_simpleviewer_svtemplateDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA) $(kipiplugin_simpleviewer_sv_DATA) \
-+ $(kipiplugin_simpleviewer_svtemplate_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +241,9 @@
+@@ -241,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -31247,577 +16418,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +304,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +377,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -351,108 +423,80 @@
- # Install the SimpleViewer files
- kipiplugin_simpleviewer_svdir = $(kde_datadir)/kipiplugin_simpleviewerexport/simpleviewer_html
- kipiplugin_simpleviewer_sv_DATA = upgrade.html space.png
--
- kipiplugin_simpleviewer_svtemplatedir = $(kde_datadir)/kipiplugin_simpleviewerexport
- kipiplugin_simpleviewer_svtemplate_DATA = index.template
--subdir = kipi-plugins/simpleviewerexport
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_simpleviewer_la_OBJECTS = plugin_simpleviewer.lo \
-- svedialog.lo simpleviewerexport.lo firstrundlg.lo
--#>- kipiplugin_simpleviewer_la_OBJECTS = \
--#>- $(am_kipiplugin_simpleviewer_la_OBJECTS)
--#>+ 5
--kipiplugin_simpleviewer_la_final_OBJECTS = kipiplugin_simpleviewer_la.all_cpp.lo
--kipiplugin_simpleviewer_la_nofinal_OBJECTS = plugin_simpleviewer.lo \
-- svedialog.lo simpleviewerexport.lo firstrundlg.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_simpleviewer_la_OBJECTS = $(kipiplugin_simpleviewer_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/firstrundlg.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_simpleviewer.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/simpleviewerexport.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/svedialog.Plo
--#>+ 8
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_simpleviewer_la.all_cpp.P ./$(DEPDIR)/firstrundlg.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_simpleviewer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/simpleviewerexport.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/svedialog.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/firstrundlg.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_simpleviewer.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/simpleviewerexport.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/svedialog.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
--DATA = $(kde_services_DATA) $(kipiplugin_simpleviewer_sv_DATA) \
-- $(kipiplugin_simpleviewer_svtemplate_DATA)
--
--DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_simpleviewer_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -428,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -437,9 +440,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -449,9 +452,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/simpleviewerexport/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -466,9 +469,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -463,7 +507,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_simpleviewer_la_LDFLAGS) $(kipiplugin_simpleviewer_la_OBJECTS) $(kipiplugin_simpleviewer_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -474,37 +518,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/svedialog.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -515,69 +547,58 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
--kipiplugin_simpleviewer_svDATA_INSTALL = $(INSTALL_DATA)
- install-kipiplugin_simpleviewer_svDATA: $(kipiplugin_simpleviewer_sv_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipiplugin_simpleviewer_svdir)
-+ test -z "$(kipiplugin_simpleviewer_svdir)" || $(mkdir_p) "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)"
- @list='$(kipiplugin_simpleviewer_sv_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipiplugin_simpleviewer_svDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
-- $(kipiplugin_simpleviewer_svDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipiplugin_simpleviewer_svDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f'"; \
-+ $(kipiplugin_simpleviewer_svDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
- done
-
- uninstall-kipiplugin_simpleviewer_svDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipiplugin_simpleviewer_sv_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
-- rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)/$$f"; \
- done
--kipiplugin_simpleviewer_svtemplateDATA_INSTALL = $(INSTALL_DATA)
- install-kipiplugin_simpleviewer_svtemplateDATA: $(kipiplugin_simpleviewer_svtemplate_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)
-+ test -z "$(kipiplugin_simpleviewer_svtemplatedir)" || $(mkdir_p) "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)"
- @list='$(kipiplugin_simpleviewer_svtemplate_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
-- $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) $$d$$p $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f'"; \
-+ $(kipiplugin_simpleviewer_svtemplateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
- done
-
- uninstall-kipiplugin_simpleviewer_svtemplateDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kipiplugin_simpleviewer_svtemplate_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
-- rm -f $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -586,6 +607,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -597,10 +619,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -623,12 +646,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -642,7 +659,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -660,9 +677,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir) $(DESTDIR)$(kipiplugin_simpleviewer_svdir) $(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kipiplugin_simpleviewer_svdir)" "$(DESTDIR)$(kipiplugin_simpleviewer_svtemplatedir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -682,7 +700,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -707,15 +725,19 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA \
- #>- install-kipiplugin_simpleviewer_svDATA \
- #>- install-kipiplugin_simpleviewer_svtemplateDATA
--#>+ 3
--install-data-am: install-kde_servicesDATA \
-+#>+ 4
-+install-data-am: \
-+ install-kde_servicesDATA \
- install-kipiplugin_simpleviewer_svDATA \
- install-kipiplugin_simpleviewer_svtemplateDATA
-
-@@ -755,17 +777,18 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-kipiplugin_simpleviewer_svDATA \
- install-kipiplugin_simpleviewer_svtemplateDATA install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
-- uninstall-kde_moduleLTLIBRARIES uninstall-kde_servicesDATA \
-+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+ uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-+ uninstall-kde_servicesDATA \
- uninstall-kipiplugin_simpleviewer_svDATA \
- uninstall-kipiplugin_simpleviewer_svtemplateDATA
-
-@@ -820,7 +843,7 @@
- -rm -f firstrundlg.moc plugin_simpleviewer.moc simpleviewerexport.moc svedialog.moc
-
- #>+ 2
--KDE_DIST=svedialog.h plugin_simpleviewer.h space.png index.template simpleviewerexport.h index.html firstrundlg.h test.txt upgrade.html Makefile.in kipiplugin_simpleviewer.desktop
-+KDE_DIST=svedialog.h plugin_simpleviewer.h space.png index.template simpleviewerexport.h index.html firstrundlg.h test.txt upgrade.html Makefile.in kipiplugin_simpleviewer.desktop Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -829,10 +852,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -859,9 +862,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/simpleviewerexport/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/simpleviewerexport/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/simpleviewerexport/Makefile.in
--- kipi-plugins/slideshow/Makefile.in
+++ kipi-plugins/slideshow/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,67 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/slideshow
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_slideshow_la_OBJECTS = plugin_slideshow.lo slideshow.lo \
-+ slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo
-+#>- kipiplugin_slideshow_la_OBJECTS = \
-+#>- $(am_kipiplugin_slideshow_la_OBJECTS)
-+#>+ 5
-+kipiplugin_slideshow_la_final_OBJECTS = kipiplugin_slideshow_la.all_cpp.lo
-+kipiplugin_slideshow_la_nofinal_OBJECTS = plugin_slideshow.lo slideshow.lo \
-+ slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_slideshow_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_slideshow_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +236,9 @@
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -31827,527 +16487,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +299,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +372,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -333,9 +400,7 @@
+@@ -415,7 +418,7 @@
- # Install this plugin in the KDE modules directory
- kde_module_LTLIBRARIES = kipiplugin_slideshow.la
--
- kipiplugin_slideshow_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
--
- kipiplugin_slideshow_la_SOURCES = plugin_slideshow.cpp \
- slideshow.cpp slideshowconfig.cpp imlibiface.cpp \
- slideshowgl.cpp toolbar.cpp
-@@ -343,113 +408,82 @@
-
- #kipiplugin_slideshow_la_LIBADD = -lkdefx $(LIB_IMLIB2) $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
- kipiplugin_slideshow_la_LIBADD = -lkdefx -lImlib2 $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_slideshow_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- kde_services_DATA = kipiplugin_slideshow.desktop
--
- kipiplugin_slideshowicondir = $(kde_datadir)/kipiplugin_slideshow/icons
- kipiplugin_slideshowicon_ICON = AUTO
--subdir = kipi-plugins/slideshow
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_slideshow_la_OBJECTS = plugin_slideshow.lo slideshow.lo \
-- slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo
--#>- kipiplugin_slideshow_la_OBJECTS = $(am_kipiplugin_slideshow_la_OBJECTS)
--#>+ 5
--kipiplugin_slideshow_la_final_OBJECTS = kipiplugin_slideshow_la.all_cpp.lo
--kipiplugin_slideshow_la_nofinal_OBJECTS = plugin_slideshow.lo slideshow.lo \
-- slideshowconfig.lo imlibiface.lo slideshowgl.lo toolbar.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_slideshow_la_OBJECTS = $(kipiplugin_slideshow_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/imlibiface.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_slideshow.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/slideshow.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/slideshowconfig.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/slideshowgl.Plo ./$(DEPDIR)/toolbar.Plo
--#>+ 10
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_slideshow_la.all_cpp.P ./$(DEPDIR)/imlibiface.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_slideshow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowconfig.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowgl.Plo ./$(DEPDIR)/toolbar.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/imlibiface.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_slideshow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshow.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowconfig.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowgl.Plo ./$(DEPDIR)/toolbar.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_slideshow_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_slideshow_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -424,9 +427,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/slideshow/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/slideshow/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -436,9 +439,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/slideshow/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/slideshow/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/slideshow/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -453,9 +456,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -460,7 +494,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_slideshow_la_LDFLAGS) $(kipiplugin_slideshow_la_OBJECTS) $(kipiplugin_slideshow_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -473,37 +507,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/toolbar.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -514,33 +536,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -549,6 +562,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -560,10 +574,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -586,12 +601,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -605,7 +614,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -623,9 +632,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -645,7 +655,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -670,13 +680,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde-icons install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: install-kde-icons \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -715,8 +729,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -782,7 +796,7 @@
- -rm -f plugin_slideshow.moc slideshow.moc slideshowconfig.moc toolbar.moc slideshowgl.moc
-
- #>+ 2
--KDE_DIST=slideshowconfig.h slideshow.h toolbar.h plugin_slideshow.h kipiplugin_slideshow.desktop slideshowgl.h Makefile.in hi22-action-slideshow.png imlibiface.h
-+KDE_DIST=slideshowconfig.h slideshow.h toolbar.h plugin_slideshow.h kipiplugin_slideshow.desktop slideshowgl.h Makefile.in hi22-action-slideshow.png imlibiface.h Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -799,10 +813,19 @@
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kipiplugin_slideshowicondir)/hicolor/22x22/actions/slideshow.png
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -820,9 +823,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/slideshow/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/slideshow/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/slideshow/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/slideshow/Makefile.in
--- kipi-plugins/timeadjust/Makefile.in
+++ kipi-plugins/timeadjust/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,67 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/timeadjust
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_timeadjust_la_OBJECTS = plugin_timeadjust.lo \
-+ timeadjustdialog.lo
-+#>- kipiplugin_timeadjust_la_OBJECTS = \
-+#>- $(am_kipiplugin_timeadjust_la_OBJECTS)
-+#>+ 5
-+kipiplugin_timeadjust_la_final_OBJECTS = kipiplugin_timeadjust_la.all_cpp.lo
-+kipiplugin_timeadjust_la_nofinal_OBJECTS = plugin_timeadjust.lo \
-+ timeadjustdialog.lo
-+ at KDE_USE_FINAL_FALSE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +236,9 @@
+@@ -236,6 +236,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -32357,497 +16556,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +299,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +372,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -345,98 +412,78 @@
+@@ -415,7 +418,7 @@
- # Install the desktop file needed to detect the plugin
- kde_services_DATA = kipiplugin_timeadjust.desktop
--subdir = kipi-plugins/timeadjust
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_timeadjust_la_OBJECTS = plugin_timeadjust.lo \
-- timeadjustdialog.lo
--#>- kipiplugin_timeadjust_la_OBJECTS = \
--#>- $(am_kipiplugin_timeadjust_la_OBJECTS)
--#>+ 5
--kipiplugin_timeadjust_la_final_OBJECTS = kipiplugin_timeadjust_la.all_cpp.lo
--kipiplugin_timeadjust_la_nofinal_OBJECTS = plugin_timeadjust.lo \
-- timeadjustdialog.lo
-- at KDE_USE_FINAL_FALSE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_nofinal_OBJECTS)
-- at KDE_USE_FINAL_TRUE@kipiplugin_timeadjust_la_OBJECTS = $(kipiplugin_timeadjust_la_final_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin_timeadjust.Plo \
--#>- @AMDEP_TRUE@ ./$(DEPDIR)/timeadjustdialog.Plo
--#>+ 4
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kipiplugin_timeadjust_la.all_cpp.P ./$(DEPDIR)/plugin_timeadjust.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/timeadjustdialog.Plo
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/plugin_timeadjust.Plo \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/timeadjustdialog.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_timeadjust_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -424,9 +427,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -436,9 +439,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/timeadjust/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -453,9 +456,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -447,7 +494,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_timeadjust_la_LDFLAGS) $(kipiplugin_timeadjust_la_OBJECTS) $(kipiplugin_timeadjust_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -456,37 +503,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/timeadjustdialog.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -497,33 +532,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -532,6 +558,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -543,10 +570,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -569,12 +597,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -588,7 +610,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -606,9 +628,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -628,7 +651,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -653,13 +676,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -695,8 +722,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -742,7 +769,7 @@
- -rm -f plugin_timeadjust.moc timeadjustdialog.moc
-
- #>+ 2
--KDE_DIST=timeadjustdialog.h kipiplugin_timeadjust.desktop plugin_timeadjust.h Makefile.in
-+KDE_DIST=timeadjustdialog.h kipiplugin_timeadjust.desktop plugin_timeadjust.h Makefile.in Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -751,10 +778,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -785,9 +788,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/timeadjust/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/timeadjust/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/timeadjust/Makefile.in
--- kipi-plugins/wallpaper/Makefile.in
+++ kipi-plugins/wallpaper/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -15,6 +15,7 @@
-
- @SET_MAKE@
-
-+
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +23,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +39,62 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = kipi-plugins/wallpaper
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-+ "$(DESTDIR)$(kde_servicesdir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am_kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
-+#>- kipiplugin_wallpaper_la_OBJECTS = \
-+#>- $(am_kipiplugin_wallpaper_la_OBJECTS)
-+#>+ 1
-+kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
-+DIST_SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
-+kde_servicesDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(kde_services_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +231,9 @@
+@@ -231,6 +231,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -32857,474 +16625,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +294,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +367,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -330,100 +392,85 @@
- xdg_menudir = @xdg_menudir@
- INCLUDES = $(LIBKIPI_CFLAGS) $(all_includes)
- #>- METASOURCES = AUTO
--
- kde_module_LTLIBRARIES = kipiplugin_wallpaper.la
- kipiplugin_wallpaper_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
- kipiplugin_wallpaper_la_SOURCES = plugin_wallpaper.cpp
--
- kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
--
- kipiplugin_wallpaper_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--
- pluginsdir = $(kde_datadir)/kipi/plugins
--
- kde_services_DATA = kipiplugin_wallpaper.desktop
--subdir = kipi-plugins/wallpaper
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(kde_module_LTLIBRARIES)
--
--am_kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
--#>- kipiplugin_wallpaper_la_OBJECTS = $(am_kipiplugin_wallpaper_la_OBJECTS)
--#>+ 1
--kipiplugin_wallpaper_la_OBJECTS = plugin_wallpaper.lo
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin_wallpaper.Plo
--#>+ 1
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plugin_wallpaper.Plo
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
--#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
--DATA = $(kde_services_DATA)
--
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--SOURCES = $(kipiplugin_wallpaper_la_SOURCES)
--
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -402,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -411,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -423,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/wallpaper/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
-+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-kde_moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
-+ @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- done
-
- clean-kde_moduleLTLIBRARIES:
- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-- test "$$dir" = "$$p" && dir=.; \
-+ test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-@@ -434,7 +481,7 @@
- $(CXXLINK) -rpath $(kde_moduledir) $(kipiplugin_wallpaper_la_LDFLAGS) $(kipiplugin_wallpaper_la_OBJECTS) $(kipiplugin_wallpaper_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -442,37 +489,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin_wallpaper.Plo at am__quote@
-
- .cpp.o:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
- .cpp.obj:
-- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .cpp.lo:
-- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCXX_TRUE@ fi
-+ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -483,33 +518,24 @@
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
--kde_servicesDATA_INSTALL = $(INSTALL_DATA)
- install-kde_servicesDATA: $(kde_services_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
- @list='$(kde_services_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- $(kde_servicesDATA_INSTALL) $$d$$p $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
- uninstall-kde_servicesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(kde_services_DATA)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(kde_servicesdir)/$$f"; \
-- rm -f $(DESTDIR)$(kde_servicesdir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -518,6 +544,7 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -529,10 +556,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -555,12 +583,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -574,7 +596,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -592,9 +614,10 @@
- check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(kde_servicesdir)
-+ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -614,7 +637,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -639,13 +662,17 @@
-
- dvi-am:
-
-+html: html-am
-+
- info: info-am
-
- info-am:
-
--#>- install-data-am: install-kde_moduleLTLIBRARIES install-kde_servicesDATA
--#>+ 1
--install-data-am: install-kde_servicesDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES \
-+#>- install-kde_servicesDATA
-+#>+ 2
-+install-data-am: \
-+ install-kde_servicesDATA
-
- #>- install-exec-am:
- #>+ 1
-@@ -681,8 +708,8 @@
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
-- distclean-tags distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-+ distclean-tags distdir dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
- install-man install-strip installcheck installcheck-am \
-@@ -720,7 +747,7 @@
- -rm -f plugin_wallpaper.moc
-
- #>+ 2
--KDE_DIST=plugin_wallpaper.h Makefile.in kipiplugin_wallpaper.desktop
-+KDE_DIST=plugin_wallpaper.h Makefile.in Makefile.am kipiplugin_wallpaper.desktop
-
- #>+ 3
- clean-closures:
-@@ -729,10 +756,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+@@ -763,9 +766,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu kipi-plugins/wallpaper/Makefile
+ $(AUTOMAKE) --foreign kipi-plugins/wallpaper/Makefile
cd $(top_srcdir) && perl admin/am_edit kipi-plugins/wallpaper/Makefile.in
---- po/Makefile.in
-+++ po/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +204,9 @@
+--- Makefile.in
++++ Makefile.in
+@@ -222,6 +222,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -33334,412 +16694,42 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +267,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +340,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -331,40 +366,53 @@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
- SUBDIRS =. br ca cs cy da de el en_GB es et fi fr ga gl hu is it ja lt mt nb nl nn pa pl pt pt_BR rw sr sr at Latn sv ta tr uk zh_CN
--subdir = po
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
-
+@@ -389,7 +392,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-+#>- @for dep in $?; do \
-+#>- case '$(am__configure_deps)' in \
-+#>- *$$dep*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
-+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
- #>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --gnu po/Makefile
--#>+ 3
-+#>- $(AUTOMAKE) --foreign po/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/Makefile
-+ $(AUTOMAKE) --foreign po/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -431,12 +434,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 $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -383,7 +431,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 \
-@@ -395,7 +449,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; \
-@@ -403,7 +457,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)' ;; \
-@@ -424,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 && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -435,14 +495,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -451,19 +503,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -473,10 +528,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -499,12 +555,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -518,7 +568,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -533,15 +583,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -551,7 +603,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -571,7 +622,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -593,6 +644,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -627,37 +680,42 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in
-+KDE_DIST=Makefile.in Makefile.am
-
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
-
-
+ config.h: stamp-h1
+@@ -448,7 +451,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 $@
--- po/br/Makefile.in
+++ po/br/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/br
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -33749,417 +16739,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/br
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/br/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/br/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/br/Makefile
+ $(AUTOMAKE) --foreign po/br/Makefile
cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 55
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -773,10 +822,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/br/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/br/Makefile
+ $(AUTOMAKE) --foreign po/br/Makefile
cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in
--- po/ca/Makefile.in
+++ po/ca/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/ca
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -34169,417 +16808,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/ca
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/ca/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/ca/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/ca/Makefile
+ $(AUTOMAKE) --foreign po/ca/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -821,9 +824,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ca/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ca/Makefile
+ $(AUTOMAKE) --foreign po/ca/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in
--- po/cs/Makefile.in
+++ po/cs/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/cs
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -34589,417 +16877,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/cs
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/cs/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/cs/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/cs/Makefile
+ $(AUTOMAKE) --foreign po/cs/Makefile
cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/cs/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/cs/Makefile
+ $(AUTOMAKE) --foreign po/cs/Makefile
cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in
--- po/cy/Makefile.in
+++ po/cy/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/cy
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -35009,417 +16946,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/cy
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/cy/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/cy/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/cy/Makefile
+ $(AUTOMAKE) --foreign po/cy/Makefile
cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -825,9 +828,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 52
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -769,10 +818,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/cy/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/cy/Makefile
+ $(AUTOMAKE) --foreign po/cy/Makefile
cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in
--- po/da/Makefile.in
+++ po/da/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/da
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -35429,417 +17015,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/da
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/da/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/da/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/da/Makefile
+ $(AUTOMAKE) --foreign po/da/Makefile
cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/da/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/da/Makefile
+ $(AUTOMAKE) --foreign po/da/Makefile
cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in
--- po/de/Makefile.in
+++ po/de/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/de
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -35849,417 +17084,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/de
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/de/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/de/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/de/Makefile
+ $(AUTOMAKE) --foreign po/de/Makefile
cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/de/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/de/Makefile
+ $(AUTOMAKE) --foreign po/de/Makefile
cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in
--- po/el/Makefile.in
+++ po/el/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/el
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -36269,417 +17153,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/el
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/el/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/el/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/el/Makefile
+ $(AUTOMAKE) --foreign po/el/Makefile
cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/el/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/el/Makefile
+ $(AUTOMAKE) --foreign po/el/Makefile
cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in
--- po/en_GB/Makefile.in
+++ po/en_GB/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/en_GB
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -36689,417 +17222,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/en_GB
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/en_GB/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/en_GB/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/en_GB/Makefile
+ $(AUTOMAKE) --foreign po/en_GB/Makefile
cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -821,9 +824,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/en_GB/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/en_GB/Makefile
+ $(AUTOMAKE) --foreign po/en_GB/Makefile
cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in
--- po/es/Makefile.in
+++ po/es/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/es
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -37109,417 +17291,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/es
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/es/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/es/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/es/Makefile
+ $(AUTOMAKE) --foreign po/es/Makefile
cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/es/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/es/Makefile
+ $(AUTOMAKE) --foreign po/es/Makefile
cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in
--- po/et/Makefile.in
+++ po/et/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/et
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -37529,417 +17360,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/et
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/et/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/et/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/et/Makefile
+ $(AUTOMAKE) --foreign po/et/Makefile
cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 55
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -773,10 +822,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/et/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/et/Makefile
+ $(AUTOMAKE) --foreign po/et/Makefile
cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in
--- po/fi/Makefile.in
+++ po/fi/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/fi
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -37949,417 +17429,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_printwizard.po kipiplugin_sendimages.po kipiplugin_wallpaper.po
- GMOFILES = kipiplugin_printwizard.gmo kipiplugin_sendimages.gmo kipiplugin_wallpaper.gmo
--subdir = po/fi
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/fi/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/fi/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/fi/Makefile
+ $(AUTOMAKE) --foreign po/fi/Makefile
cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -773,9 +776,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_sendimages.po kipiplugin_wallpaper.po Makefile.in kipiplugin_printwizard.po
-+KDE_DIST=kipiplugin_sendimages.po kipiplugin_wallpaper.po Makefile.in kipiplugin_printwizard.po Makefile.am
-
- #>+ 10
- kipiplugin_printwizard.gmo: kipiplugin_printwizard.po
-@@ -713,10 +762,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/fi/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/fi/Makefile
+ $(AUTOMAKE) --foreign po/fi/Makefile
cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in
--- po/fr/Makefile.in
+++ po/fr/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/fr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -38369,417 +17498,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/fr
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/fr/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/fr/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/fr/Makefile
+ $(AUTOMAKE) --foreign po/fr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -829,9 +832,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/fr/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/fr/Makefile
+ $(AUTOMAKE) --foreign po/fr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in
--- po/ga/Makefile.in
+++ po/ga/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/ga
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -38789,417 +17567,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/ga
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/ga/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/ga/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/ga/Makefile
+ $(AUTOMAKE) --foreign po/ga/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ga/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ga/Makefile
+ $(AUTOMAKE) --foreign po/ga/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in
--- po/gl/Makefile.in
+++ po/gl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/gl
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -39209,417 +17636,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/gl
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/gl/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/gl/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/gl/Makefile
+ $(AUTOMAKE) --foreign po/gl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/gl/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/gl/Makefile
+ $(AUTOMAKE) --foreign po/gl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in
--- po/hu/Makefile.in
+++ po/hu/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/hu
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -39629,417 +17705,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo
--subdir = po/hu
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/hu/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/hu/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/hu/Makefile
+ $(AUTOMAKE) --foreign po/hu/Makefile
cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -805,9 +808,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am
-
- #>+ 37
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -749,10 +798,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/hu/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/hu/Makefile
+ $(AUTOMAKE) --foreign po/hu/Makefile
cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in
--- po/is/Makefile.in
+++ po/is/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/is
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -40049,417 +17774,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/is
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/is/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/is/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/is/Makefile
+ $(AUTOMAKE) --foreign po/is/Makefile
cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -821,9 +824,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/is/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/is/Makefile
+ $(AUTOMAKE) --foreign po/is/Makefile
cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in
--- po/it/Makefile.in
+++ po/it/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/it
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -40469,417 +17843,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/it
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/it/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/it/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/it/Makefile
+ $(AUTOMAKE) --foreign po/it/Makefile
cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/it/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/it/Makefile
+ $(AUTOMAKE) --foreign po/it/Makefile
cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in
--- po/ja/Makefile.in
+++ po/ja/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/ja
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -40889,417 +17912,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/ja
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/ja/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/ja/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/ja/Makefile
+ $(AUTOMAKE) --foreign po/ja/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ja/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ja/Makefile
+ $(AUTOMAKE) --foreign po/ja/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in
--- po/lt/Makefile.in
+++ po/lt/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/lt
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -41309,417 +17981,135 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/lt
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/lt/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/lt/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/lt/Makefile
+ $(AUTOMAKE) --foreign po/lt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -825,9 +828,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,13 @@
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/lt/Makefile
++ $(AUTOMAKE) --foreign po/lt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
- 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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
+--- po/Makefile.in
++++ po/Makefile.in
+@@ -204,6 +204,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAGICK_CONFIG = @MAGICK_CONFIG@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -368,7 +371,7 @@
+ all: docs-am all-recursive
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
+ .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*) \
+@@ -377,9 +380,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --gnu po/Makefile
++#>- $(AUTOMAKE) --foreign po/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -389,9 +392,9 @@
+ exit 1;; \
+ esac; \
done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/Makefile
++ $(AUTOMAKE) --foreign po/Makefile
+ cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -406,9 +409,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+-$(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
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
+ mostlyclean-libtool:
+@@ -710,9 +713,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/Makefile
++ $(AUTOMAKE) --foreign po/Makefile
+ cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 52
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -769,10 +818,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/lt/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign po/lt/Makefile
- cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in
-
-
--- po/mt/Makefile.in
+++ po/mt/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/mt
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -41729,417 +18119,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/mt
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mt/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mt/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/mt/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/mt/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mt/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/mt/Makefile
+ $(AUTOMAKE) --foreign po/mt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/mt/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -821,9 +824,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/mt/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/mt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/mt/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/mt/Makefile
+ $(AUTOMAKE) --foreign po/mt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/mt/Makefile.in
--- po/nb/Makefile.in
+++ po/nb/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/nb
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -42149,417 +18188,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_jpeglossless.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_jpeglossless.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/nb
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/nb/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/nb/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/nb/Makefile
+ $(AUTOMAKE) --foreign po/nb/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -809,9 +812,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 40
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -753,10 +802,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nb/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/nb/Makefile
+ $(AUTOMAKE) --foreign po/nb/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in
--- po/nl/Makefile.in
+++ po/nl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/nl
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -42569,417 +18257,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/nl
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/nl/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/nl/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/nl/Makefile
+ $(AUTOMAKE) --foreign po/nl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nl/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/nl/Makefile
+ $(AUTOMAKE) --foreign po/nl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in
--- po/nn/Makefile.in
+++ po/nn/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/nn
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -42989,417 +18326,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_calendar.po kipiplugin_printwizard.po kipiplugin_wallpaper.po
- GMOFILES = kipiplugin_calendar.gmo kipiplugin_printwizard.gmo kipiplugin_wallpaper.gmo
--subdir = po/nn
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/nn/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/nn/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/nn/Makefile
+ $(AUTOMAKE) --foreign po/nn/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -769,9 +772,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_wallpaper.po kipiplugin_calendar.po Makefile.in kipiplugin_printwizard.po
-+KDE_DIST=kipiplugin_wallpaper.po kipiplugin_calendar.po Makefile.in kipiplugin_printwizard.po Makefile.am
-
- #>+ 10
- kipiplugin_calendar.gmo: kipiplugin_calendar.po
-@@ -713,10 +762,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/nn/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/nn/Makefile
+ $(AUTOMAKE) --foreign po/nn/Makefile
cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in
--- po/pa/Makefile.in
+++ po/pa/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/pa
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -43409,417 +18395,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_findimages.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/pa
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/pa/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/pa/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/pa/Makefile
+ $(AUTOMAKE) --foreign po/pa/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -817,9 +820,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 46
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -761,10 +810,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pa/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pa/Makefile
+ $(AUTOMAKE) --foreign po/pa/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in
--- po/pl/Makefile.in
+++ po/pl/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/pl
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -43829,417 +18464,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/pl
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/pl/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/pl/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/pl/Makefile
+ $(AUTOMAKE) --foreign po/pl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -825,9 +828,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 52
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -769,10 +818,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pl/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pl/Makefile
+ $(AUTOMAKE) --foreign po/pl/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in
--- po/pt/Makefile.in
+++ po/pt/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/pt
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -44249,417 +18533,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/pt
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/pt/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/pt/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/pt/Makefile
+ $(AUTOMAKE) --foreign po/pt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pt/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pt/Makefile
+ $(AUTOMAKE) --foreign po/pt/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in
--- po/pt_BR/Makefile.in
+++ po/pt_BR/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/pt_BR
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -44669,417 +18602,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/pt_BR
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/pt_BR/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/pt_BR/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/pt_BR/Makefile
+ $(AUTOMAKE) --foreign po/pt_BR/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -821,9 +824,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/pt_BR/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/pt_BR/Makefile
+ $(AUTOMAKE) --foreign po/pt_BR/Makefile
cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in
--- po/rw/Makefile.in
+++ po/rw/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/rw
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -45089,417 +18671,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/rw
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/rw/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/rw/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/rw/Makefile
+ $(AUTOMAKE) --foreign po/rw/Makefile
cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -825,9 +828,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 52
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -769,10 +818,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/rw/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/rw/Makefile
+ $(AUTOMAKE) --foreign po/rw/Makefile
cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in
--- po/sr/Makefile.in
+++ po/sr/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/sr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -45509,417 +18740,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/sr
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/sr/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/sr/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/sr/Makefile
+ $(AUTOMAKE) --foreign po/sr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -829,9 +832,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 55
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -773,10 +822,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sr/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/sr/Makefile
+ $(AUTOMAKE) --foreign po/sr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in
--- po/sr at Latn/Makefile.in
+++ po/sr at Latn/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/sr at Latn
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -45929,417 +18809,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugins.gmo
--subdir = po/sr at Latn
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr at Latn/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/sr at Latn/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr at Latn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
+ $(AUTOMAKE) --foreign po/sr at Latn/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sr at Latn/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -829,9 +832,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 55
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -773,10 +822,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr at Latn/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr at Latn/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/sr at Latn/Makefile
+ $(AUTOMAKE) --foreign po/sr at Latn/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sr at Latn/Makefile.in
--- po/sv/Makefile.in
+++ po/sv/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/sv
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -46349,417 +18878,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/sv
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/sv/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/sv/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/sv/Makefile
+ $(AUTOMAKE) --foreign po/sv/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am
-
- #>+ 52
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -769,10 +818,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/sv/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/sv/Makefile
+ $(AUTOMAKE) --foreign po/sv/Makefile
cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in
--- po/ta/Makefile.in
+++ po/ta/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/ta
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -46769,417 +18947,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugins.gmo
--subdir = po/ta
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/ta/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/ta/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/ta/Makefile
+ $(AUTOMAKE) --foreign po/ta/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -821,9 +824,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 49
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -765,10 +814,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/ta/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/ta/Makefile
+ $(AUTOMAKE) --foreign po/ta/Makefile
cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in
--- po/tr/Makefile.in
+++ po/tr/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/tr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -47189,417 +19016,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_cdarchiving.po kipiplugin_galleryexport.po kipiplugin_imagesgallery.po kipiplugin_jpeglossless.po kipiplugin_kameraklient.po kipiplugin_mpegencoder.po kipiplugin_printwizard.po kipiplugin_rawconverter.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_findimages.po kipiplugin_flickrexport.po kipiplugin_htmlexport.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_cdarchiving.gmo kipiplugin_galleryexport.gmo kipiplugin_imagesgallery.gmo kipiplugin_jpeglossless.gmo kipiplugin_kameraklient.gmo kipiplugin_mpegencoder.gmo kipiplugin_printwizard.gmo kipiplugin_rawconverter.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_batchprocessimages.gmo kipiplugin_findimages.gmo kipiplugin_flickrexport.gmo kipiplugin_htmlexport.gmo kipiplugins.gmo
--subdir = po/tr
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/tr/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/tr/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/tr/Makefile
+ $(AUTOMAKE) --foreign po/tr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -833,9 +836,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_findimages.po kipiplugin_mpegencoder.po kipiplugin_htmlexport.po kipiplugin_jpeglossless.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_batchprocessimages.po kipiplugin_imagesgallery.po kipiplugin_galleryexport.po kipiplugin_cdarchiving.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po kipiplugin_rawconverter.po Makefile.in kipiplugin_kameraklient.po kipiplugin_printwizard.po kipiplugin_flickrexport.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 58
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -777,10 +826,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/tr/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/tr/Makefile
+ $(AUTOMAKE) --foreign po/tr/Makefile
cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in
--- po/uk/Makefile.in
+++ po/uk/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/uk
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -47609,417 +19085,66 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_calendar.po kipiplugin_rawconverter.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugin_htmlexport.po
- GMOFILES = kipiplugin_calendar.gmo kipiplugin_rawconverter.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugin_htmlexport.gmo
--subdir = po/uk
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/uk/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/uk/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/uk/Makefile
+ $(AUTOMAKE) --foreign po/uk/Makefile
cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -781,9 +784,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_htmlexport.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_calendar.po kipiplugin_rawconverter.po Makefile.in kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_htmlexport.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_calendar.po kipiplugin_rawconverter.po Makefile.in Makefile.am kipiplugin_timeadjust.po
-
- #>+ 19
- kipiplugin_calendar.gmo: kipiplugin_calendar.po
-@@ -725,10 +774,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/uk/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/uk/Makefile
+ $(AUTOMAKE) --foreign po/uk/Makefile
cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in
--- po/zh_CN/Makefile.in
+++ po/zh_CN/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 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.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = po/zh_CN
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+ $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- html-recursive info-recursive install-data-recursive \
-+#>- install-exec-recursive install-info-recursive \
-+#>- install-recursive installcheck-recursive installdirs-recursive \
-+#>- pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+ html-recursive info-recursive install-data-recursive \
-+ install-exec-recursive install-info-recursive \
-+ install-recursive installcheck-recursive installdirs-recursive \
-+ pdf-recursive ps-recursive uninstall-info-recursive \
-+ uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -175,6 +206,9 @@
+@@ -206,6 +206,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAGICK_CONFIG = @MAGICK_CONFIG@
@@ -48029,341 +19154,59 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -235,6 +269,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -306,6 +342,7 @@
- libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@
- po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@
-@@ -336,40 +373,53 @@
- #>+ 2
- POFILES = kipiplugin_acquireimages.po kipiplugin_calendar.po kipiplugin_imagesgallery.po kipiplugin_printwizard.po kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_timeadjust.po kipiplugin_wallpaper.po kipiplugins.po
- GMOFILES = kipiplugin_acquireimages.gmo kipiplugin_calendar.gmo kipiplugin_imagesgallery.gmo kipiplugin_printwizard.gmo kipiplugin_sendimages.gmo kipiplugin_slideshow.gmo kipiplugin_timeadjust.gmo kipiplugin_wallpaper.gmo kipiplugins.gmo
--subdir = po/zh_CN
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- ps-recursive install-info-recursive uninstall-info-recursive \
--#>- all-recursive install-data-recursive install-exec-recursive \
--#>- installdirs-recursive install-recursive uninstall-recursive \
--#>- check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-- ps-recursive install-info-recursive uninstall-info-recursive \
-- all-recursive install-data-recursive install-exec-recursive \
-- installdirs-recursive install-recursive uninstall-recursive \
-- check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
+@@ -375,7 +378,7 @@
all: all-nls docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(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*) \
-+#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- && exit 0; \
-+#>- exit 1;; \
-+#>- esac; \
-+#>- done; \
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -384,9 +387,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \
+#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
#>- cd $(top_srcdir) && \
-#>- $(AUTOMAKE) --gnu po/zh_CN/Makefile
--#>+ 3
+#>- $(AUTOMAKE) --foreign po/zh_CN/Makefile
-+#>+ 12
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -396,9 +399,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu po/zh_CN/Makefile
+ $(AUTOMAKE) --foreign po/zh_CN/Makefile
cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +416,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
+ 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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
- -rm -f *.lo
-@@ -388,7 +438,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 \
-@@ -400,7 +456,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; \
+@@ -793,9 +796,9 @@
+ exit 1;; \
+ esac; \
done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -408,7 +464,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)' ;; \
-@@ -429,7 +491,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 \
-@@ -440,14 +502,6 @@
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -456,19 +510,22 @@
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-+tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
-- if (etags --etags-include --version) >/dev/null 2>&1; then \
-+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-+ empty_fix=.; \
- else \
- include_option=--include; \
-+ empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && \
-+ test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-@@ -478,10 +535,11 @@
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-- test -z "$(ETAGS_ARGS)$$tags$$unique" \
-- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique
--
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-@@ -504,14 +562,6 @@
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -527,7 +577,7 @@
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
-- $(mkinstalldirs) "$(distdir)$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
-@@ -542,15 +592,17 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -d $(distdir)/$$subdir \
-- || mkdir $(distdir)/$$subdir \
-+ test -d "$(distdir)/$$subdir" \
-+ || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
-+ distdir=`$(am__cd) $(distdir) && pwd`; \
-+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$(top_distdir)" \
-- distdir=../$(distdir)/$$subdir \
-+ top_distdir="$$top_distdir" \
-+ distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
-@@ -560,7 +612,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -582,7 +633,7 @@
- clean-generic:
-
- distclean-generic:
-- -rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -604,6 +655,8 @@
-
- dvi-am:
-
-+html: html-recursive
-+
- info: info-recursive
-
- info-am:
-@@ -642,29 +695,25 @@
-
- uninstall-info: uninstall-info-recursive
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-- clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+ clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am \
-- dvi-recursive info info-am info-recursive install install-am \
-- 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-man \
-- install-recursive install-strip installcheck installcheck-am \
-- installdirs installdirs-am installdirs-recursive \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am \
-- uninstall-info-recursive uninstall-recursive
-+ distclean-recursive distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-recursive \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool \
-+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po Makefile.in kipiplugin_printwizard.po kipiplugin_timeadjust.po
-+KDE_DIST=kipiplugin_sendimages.po kipiplugin_slideshow.po kipiplugin_wallpaper.po kipiplugin_imagesgallery.po kipiplugin_calendar.po kipiplugins.po kipiplugin_acquireimages.po Makefile.in kipiplugin_printwizard.po Makefile.am kipiplugin_timeadjust.po
-
- #>+ 28
- kipiplugin_acquireimages.gmo: kipiplugin_acquireimages.po
-@@ -737,10 +786,19 @@
- #>+ 2
- docs-am:
-
--#>+ 6
-+#>+ 15
- force-reedit:
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu po/zh_CN/Makefile
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \
-+ cd $(top_srcdir) && \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu po/zh_CN/Makefile
+ $(AUTOMAKE) --foreign po/zh_CN/Makefile
cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in
More information about the pkg-kde-commits
mailing list