Re: RFS: abiword
Just for convenience, here is the debdiff output (attached) to show
the changes comparing to last NMU.
Cheers,
Dmitry.
diff -Nru -w abiword-2.9.1/debian/changelog abiword-2.9.1/debian/changelog
--- abiword-2.9.1/debian/changelog 2011-11-09 09:11:35.000000000 +1100
+++ abiword-2.9.1/debian/changelog 2011-11-21 15:16:18.000000000 +1100
@@ -1,3 +1,13 @@
+abiword (2.9.1-1) unstable; urgency=low
+
+ * New maintainer (Closes: #648341)
+ * Added patch to disable smooth scrolling (Closes: #624095)
+ * Packaging updates
+ - dh-autoreconf instead of patches for make files
+ - standards to recent versions
+
+ -- Dmitry Smirnov <onlyjob@member.fsf.org> Mon, 21 Nov 2011 01:58:27 +1100
+
abiword (2.9.1-0.2) unstable; urgency=low
* Non-maintainer upload.
diff -Nru -w abiword-2.9.1/debian/compat abiword-2.9.1/debian/compat
--- abiword-2.9.1/debian/compat 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/compat 2011-11-21 15:16:18.000000000 +1100
@@ -1 +1 @@
-7
+8
diff -Nru -w abiword-2.9.1/debian/control abiword-2.9.1/debian/control
--- abiword-2.9.1/debian/control 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/control 2011-11-21 15:16:18.000000000 +1100
@@ -2,11 +2,19 @@
Section: gnome
Priority: optional
Maintainer: Patrik Fimml <patrik@fimml.at>
-Build-Depends: cdbs, debhelper (>= 7), quilt, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libasio-dev (>= 1.4.1), libenchant-dev (>= 1.2.0), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev (>= 4.6.7), libloudmouth1-dev, libots-dev, libpng12-dev, libpopt-dev, libreadline-dev, libwmf-dev, libwpd-dev, libwpg-dev (>= 0.1.0), libwps-dev, libwv-dev (>= 1.2), libgoffice-0.8-dev, libpsiconv-dev (>= 0.9.4), librsvg2-dev (>= 2.16.0), libboost-regex-dev, libsoup2.4-dev, libdbus-glib-1-dev, libxslt1-dev, libgsf-1-dev, librasqal3-dev, librdf0-dev
-Standards-Version: 3.9.1.0
+Uploaders: Dmitry Smirnov <onlyjob@member.fsf.org>
+Build-Depends: cdbs, debhelper (>= 8), dh-autoreconf, quilt,
+ libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1),
+ libasio-dev (>= 1.4.1), libenchant-dev (>= 1.2.0), libfreetype6-dev, libfribidi-dev, libglade2-dev,
+ libglib2.0-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5),
+ liblink-grammar4-dev (>= 4.6.7), libloudmouth1-dev, libots-dev, libpng12-dev, libpopt-dev,
+ libreadline-dev, libwmf-dev, libwpd-dev, libwpg-dev (>= 0.1.0), libwps-dev, libwv-dev (>= 1.2),
+ libgoffice-0.8-dev, libpsiconv-dev (>= 0.9.4), librsvg2-dev (>= 2.16.0), libboost-regex-dev,
+ libsoup2.4-dev, libdbus-glib-1-dev, libxslt1-dev, libgsf-1-dev, librasqal3-dev, librdf0-dev
+Standards-Version: 3.9.2
Homepage: http://www.abisource.com/
-Vcs-Browser: http://git.debian.org/?p=users/patrikf-guest/abiword.git;a=summary
-Vcs-Git: git://git.debian.org/users/patrikf-guest/abiword.git
+Vcs-Browser: http://git.debian.org/?p=users/onlyjob-guest/abiword.git
+Vcs-Git: git://anonscm.debian.org/users/onlyjob-guest/abiword.git
Package: abiword-common
Section: editors
diff -Nru -w abiword-2.9.1/debian/patches/624095-disable_smooth_scrolling.patch abiword-2.9.1/debian/patches/624095-disable_smooth_scrolling.patch
--- abiword-2.9.1/debian/patches/624095-disable_smooth_scrolling.patch 1970-01-01 10:00:00.000000000 +1000
+++ abiword-2.9.1/debian/patches/624095-disable_smooth_scrolling.patch 2011-11-21 15:16:18.000000000 +1100
@@ -0,0 +1,33 @@
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+From: Thomas Richter <richter@rus.uni-stuttgart.de>
+Subject: Cannot disable smooth scrolling
+Origin: other, http://bugs.debian.org/624095
+Bugs-Debian: http://bugs.debian.org/624095
+Last-Update: 2011-11-21
+Forwarded: no
+Description: Disable smooth scrolling
+ Commenting code which is enabling smooth scrolling disregarding preferences
+ to leave decision whenever use the smooth scrolling or not to user.
+
+--- a/src/text/fmt/xp/fv_View.cpp
++++ b/src/text/fmt/xp/fv_View.cpp
+@@ -13998,16 +13998,19 @@
+ if(static_cast<UT_sint32>(m_iNumHorizPages) > m_pLayout->countPages())
+ {
+ m_iNumHorizPages = m_pLayout->countPages();
+ }
++/* Debian bug #624095: smooth scrolling enabled, preferences ignored.
++ * Commenting to leave decision whenever use the smooth scrolling to user.
+ if (m_iNumHorizPages > 1)
+ {
+ XAP_App::getApp()->setEnableSmoothScrolling(false);
+ }
+ else
+ {
+ XAP_App::getApp()->setEnableSmoothScrolling(true);
+ }
++*/
+ if(iOldNo != static_cast<UT_sint32>(m_iNumHorizPages))
+ {
+ UT_uint32 iPrevYOffset = m_yScrollOffset;
+ XAP_Frame * pFrame = static_cast<XAP_Frame*>(getParentData());
diff -Nru -w abiword-2.9.1/debian/patches/debian/libtool-as-needed.diff abiword-2.9.1/debian/patches/debian/libtool-as-needed.diff
--- abiword-2.9.1/debian/patches/debian/libtool-as-needed.diff 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/patches/debian/libtool-as-needed.diff 1970-01-01 10:00:00.000000000 +1000
@@ -1,48 +0,0 @@
-From: Patrik Fimml <patrik@fimml.at>
-Subject: [PATCH] debian/libtool-as-needed
-
-Fix ltmain.sh to correctly put -Wl,--as-needed before library arguments.
-
-Patch by Josselin Mouette <joss@debian.org> in
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
-
-Signed-off-by: Patrik Fimml <patrik@fimml.at>
-
----
- ltmain.sh | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/ltmain.sh b/ltmain.sh
-index a72f2fd..fd4cd52 100755
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -4716,6 +4716,11 @@ func_mode_link ()
- arg=$func_stripname_result
- ;;
-
-+ -Wl,--as-needed)
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
-+
- -Wl,*)
- func_stripname '-Wl,' '' "$arg"
- args=$func_stripname_result
-@@ -5067,6 +5072,15 @@ func_mode_link ()
- lib=
- found=no
- case $deplib in
-+ -Wl,--as-needed)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ fi
-+ continue
-+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
---
-tg: (a60ef3b..) debian/libtool-as-needed (depends on: master)
diff -Nru -w abiword-2.9.1/debian/patches/debian/rerun-automake.diff abiword-2.9.1/debian/patches/debian/rerun-automake.diff
--- abiword-2.9.1/debian/patches/debian/rerun-automake.diff 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/patches/debian/rerun-automake.diff 1970-01-01 10:00:00.000000000 +1000
@@ -1,1294 +0,0 @@
-From: Patrik Fimml <patrik@fimml.at>
-Subject: [PATCH] debian/rerun-automake
-
-Re-run automake to make Makefile.in's reflect modifications in Makefile.am's.
-
-Signed-off-by: Patrik Fimml <patrik@fimml.at>
-
----
- Makefile.in | 4 ---
- plugins/aiksaurus/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/applix/Makefile.in | 1 +
- plugins/babelfish/Makefile.in | 1 +
- plugins/bmp/Makefile.in | 1 +
- plugins/clarisworks/Makefile.in | 1 +
- plugins/collab/Makefile.in | 1 +
- plugins/command/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/docbook/Makefile.in | 1 +
- plugins/eml/Makefile.in | 1 +
- plugins/freetranslation/Makefile.in | 1 +
- plugins/garble/Makefile.in | 1 +
- plugins/gda/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/gdict/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/gimp/Makefile.in | 1 +
- plugins/goffice/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/google/Makefile.in | 1 +
- plugins/grammar/Makefile.in | 1 +
- plugins/hancom/Makefile.in | 1 +
- plugins/hrtext/Makefile.in | 1 +
- plugins/iscii/Makefile.in | 1 +
- plugins/kword/Makefile.in | 1 +
- plugins/latex/Makefile.in | 1 +
- plugins/loadbindings/Makefile.in | 1 +
- plugins/mathview/Makefile.in | 1 +
- plugins/mht/Makefile.in | 1 +
- plugins/mif/Makefile.in | 1 +
- plugins/mswrite/Makefile.in | 1 +
- plugins/opendocument/Makefile.in | 1 +
- plugins/openwriter/Makefile.in | 1 +
- plugins/openxml/Makefile.in | 1 +
- plugins/opml/Makefile.in | 1 +
- plugins/ots/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/paint/Makefile.in | 1 +
- plugins/passepartout/Makefile.in | 1 +
- plugins/pdb/Makefile.in | 1 +
- plugins/pdf/Makefile.in | 1 +
- plugins/presentation/Makefile.in | 1 +
- plugins/psion/Makefile.in | 49 ++++++++++++++++++++++++++++------
- plugins/rsvg/Makefile.in | 1 +
- plugins/s5/Makefile.in | 1 +
- plugins/sdw/Makefile.in | 1 +
- plugins/t602/Makefile.in | 1 +
- plugins/urldict/Makefile.in | 1 +
- plugins/wikipedia/Makefile.in | 1 +
- plugins/wmf/Makefile.in | 1 +
- plugins/wml/Makefile.in | 1 +
- plugins/wordperfect/Makefile.in | 1 +
- plugins/wpg/Makefile.in | 1 +
- plugins/xslfo/Makefile.in | 1 +
- 50 files changed, 322 insertions(+), 67 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ecf5703..24e88ad 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -459,10 +459,6 @@ EXTRA_DIST = \
-
- DISTCLEANFILES = \
- abiword-$(ABIWORD_SERIES).pc \
-- plugin-builtin.m4 \
-- plugin-configure.m4 \
-- plugin-list.m4 \
-- plugin-makefiles.m4 \
- doltcompile \
- doltlibtool
-
-diff --git a/plugins/aiksaurus/Makefile.in b/plugins/aiksaurus/Makefile.in
-index 90339be..6a184f8 100644
---- a/plugins/aiksaurus/Makefile.in
-+++ b/plugins/aiksaurus/Makefile.in
-@@ -78,17 +78,20 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
- aiksaurus_la_DEPENDENCIES = $(platform_lib) xp/libxp.la
- am_aiksaurus_la_OBJECTS =
- aiksaurus_la_OBJECTS = $(am_aiksaurus_la_OBJECTS)
--aiksaurus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(aiksaurus_la_LDFLAGS) $(LDFLAGS) -o $@
-+aiksaurus_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(aiksaurus_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(aiksaurus_la_SOURCES)
-+SOURCES = $(aiksaurus_la_SOURCES) $(nodist_EXTRA_aiksaurus_la_SOURCES)
- DIST_SOURCES = $(aiksaurus_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -422,15 +425,18 @@ aiksaurus_la_LIBADD = \
- xp/libxp.la
-
- aiksaurus_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(AIKSAURUS_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-
- aiksaurus_la_SOURCES =
-+nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -501,6 +507,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -739,6 +768,7 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -784,6 +814,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/applix/Makefile.in b/plugins/applix/Makefile.in
-index 3954c77..c3166e1 100644
---- a/plugins/applix/Makefile.in
-+++ b/plugins/applix/Makefile.in
-@@ -425,6 +425,7 @@ applix_la_LIBADD = \
- xp/libxp.la
-
- applix_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(APPLIX_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/babelfish/Makefile.in b/plugins/babelfish/Makefile.in
-index d935d63..6490e7c 100644
---- a/plugins/babelfish/Makefile.in
-+++ b/plugins/babelfish/Makefile.in
-@@ -425,6 +425,7 @@ babelfish_la_LIBADD = \
- xp/libxp.la
-
- babelfish_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(BABELFISH_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/bmp/Makefile.in b/plugins/bmp/Makefile.in
-index d0dc581..e3ae95e 100644
---- a/plugins/bmp/Makefile.in
-+++ b/plugins/bmp/Makefile.in
-@@ -425,6 +425,7 @@ bmp_la_LIBADD = \
- xp/libxp.la
-
- bmp_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(BMP_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/clarisworks/Makefile.in b/plugins/clarisworks/Makefile.in
-index 0da4819..a632264 100644
---- a/plugins/clarisworks/Makefile.in
-+++ b/plugins/clarisworks/Makefile.in
-@@ -427,6 +427,7 @@ clarisworks_la_LIBADD = \
- xp/libxp.la
-
- clarisworks_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(CLARISWORKS_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/collab/Makefile.in b/plugins/collab/Makefile.in
-index c5ecfcf..bfc24c2 100644
---- a/plugins/collab/Makefile.in
-+++ b/plugins/collab/Makefile.in
-@@ -428,6 +428,7 @@ top_srcdir = @top_srcdir@
- @TOOLKIT_COCOA_FALSE@ core/libcore.la
-
- @TOOLKIT_COCOA_FALSE@collab_la_LDFLAGS = \
-+@TOOLKIT_COCOA_FALSE@ $(DEPS_LIBS) \
- @TOOLKIT_COCOA_FALSE@ $(COLLAB_LIBS) \
- @TOOLKIT_COCOA_FALSE@ $(SYSTEM_LIBS) \
- @TOOLKIT_COCOA_FALSE@ -avoid-version \
-diff --git a/plugins/command/Makefile.in b/plugins/command/Makefile.in
-index 8febd46..371f1a4 100644
---- a/plugins/command/Makefile.in
-+++ b/plugins/command/Makefile.in
-@@ -77,18 +77,21 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
- @TOOLKIT_COCOA_FALSE@command_la_DEPENDENCIES = xp/libxp.la
- am_command_la_OBJECTS =
- command_la_OBJECTS = $(am_command_la_OBJECTS)
--command_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(command_la_LDFLAGS) $(LDFLAGS) -o $@
-+command_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(command_la_LDFLAGS) $(LDFLAGS) -o $@
- @TOOLKIT_COCOA_FALSE@am_command_la_rpath = -rpath $(plugindir)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(command_la_SOURCES)
-+SOURCES = $(command_la_SOURCES) $(nodist_EXTRA_command_la_SOURCES)
- DIST_SOURCES = $(command_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -420,15 +423,18 @@ top_srcdir = @top_srcdir@
- @TOOLKIT_COCOA_FALSE@ xp/libxp.la
-
- @TOOLKIT_COCOA_FALSE@command_la_LDFLAGS = \
-+@TOOLKIT_COCOA_FALSE@ $(DEPS_LIBS) \
- @TOOLKIT_COCOA_FALSE@ $(COMMAND_LIBS) \
- @TOOLKIT_COCOA_FALSE@ -avoid-version \
- @TOOLKIT_COCOA_FALSE@ -module \
- @TOOLKIT_COCOA_FALSE@ -no-undefined
-
- @TOOLKIT_COCOA_FALSE@command_la_SOURCES =
-+@TOOLKIT_COCOA_FALSE@nodist_EXTRA_command_la_SOURCES = dummy.cpp
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -499,6 +505,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -737,6 +766,7 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -782,6 +812,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/docbook/Makefile.in b/plugins/docbook/Makefile.in
-index 803f03a..4ca7c27 100644
---- a/plugins/docbook/Makefile.in
-+++ b/plugins/docbook/Makefile.in
-@@ -425,6 +425,7 @@ docbook_la_LIBADD = \
- xp/libxp.la
-
- docbook_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(DOCBOOK_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/eml/Makefile.in b/plugins/eml/Makefile.in
-index 9acdd2b..daf678b 100644
---- a/plugins/eml/Makefile.in
-+++ b/plugins/eml/Makefile.in
-@@ -425,6 +425,7 @@ eml_la_LIBADD = \
- xp/libxp.la
-
- eml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(EML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/freetranslation/Makefile.in b/plugins/freetranslation/Makefile.in
-index dfa04ed..d108c68 100644
---- a/plugins/freetranslation/Makefile.in
-+++ b/plugins/freetranslation/Makefile.in
-@@ -427,6 +427,7 @@ freetranslation_la_LIBADD = \
- xp/libxp.la
-
- freetranslation_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(FREETRANSLATION_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/garble/Makefile.in b/plugins/garble/Makefile.in
-index d45c35c..a258372 100644
---- a/plugins/garble/Makefile.in
-+++ b/plugins/garble/Makefile.in
-@@ -427,6 +427,7 @@ top_srcdir = @top_srcdir@
- @TOOLKIT_COCOA_FALSE@ $(GARBLE_LIBS) $(PNG_LIBS) -ljpeg
-
- @TOOLKIT_COCOA_FALSE@garble_la_LDFLAGS = \
-+@TOOLKIT_COCOA_FALSE@ $(DEPS_LIBS) \
- @TOOLKIT_COCOA_FALSE@ $(GARBLE_LIBS) \
- @TOOLKIT_COCOA_FALSE@ -avoid-version \
- @TOOLKIT_COCOA_FALSE@ -module \
-diff --git a/plugins/gda/Makefile.in b/plugins/gda/Makefile.in
-index 1315c8d..69cb347 100644
---- a/plugins/gda/Makefile.in
-+++ b/plugins/gda/Makefile.in
-@@ -77,17 +77,20 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
- gda_la_DEPENDENCIES = unix/libunix.la
- am_gda_la_OBJECTS =
- gda_la_OBJECTS = $(am_gda_la_OBJECTS)
--gda_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gda_la_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+gda_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+ $(gda_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(gda_la_SOURCES)
-+SOURCES = $(gda_la_SOURCES) $(nodist_EXTRA_gda_la_SOURCES)
- DIST_SOURCES = $(gda_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -419,18 +422,21 @@ gda_la_LIBADD = \
- unix/libunix.la
-
- gda_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GDA_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-
- gda_la_SOURCES =
-+nodist_EXTRA_gda_la_SOURCES = dummy.cpp
- EXTRA_DIST = \
- plugin.m4
-
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -501,6 +507,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -739,6 +768,7 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -784,6 +814,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/gdict/Makefile.in b/plugins/gdict/Makefile.in
-index 0de219b..e197c30 100644
---- a/plugins/gdict/Makefile.in
-+++ b/plugins/gdict/Makefile.in
-@@ -77,20 +77,23 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
- @TOOLKIT_GTK_TRUE@gdict_la_DEPENDENCIES = unix/libunix.la
- am_gdict_la_OBJECTS =
- gdict_la_OBJECTS = $(am_gdict_la_OBJECTS)
--gdict_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gdict_la_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+gdict_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(gdict_la_LDFLAGS) $(LDFLAGS) -o $@
- @GDICT_BUILTIN_FALSE@@TOOLKIT_GTK_TRUE@am_gdict_la_rpath = -rpath \
- @GDICT_BUILTIN_FALSE@@TOOLKIT_GTK_TRUE@ $(plugindir)
- @GDICT_BUILTIN_TRUE@@TOOLKIT_GTK_TRUE@am_gdict_la_rpath =
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(gdict_la_SOURCES)
-+SOURCES = $(gdict_la_SOURCES) $(nodist_EXTRA_gdict_la_SOURCES)
- DIST_SOURCES = $(gdict_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -423,18 +426,21 @@ top_srcdir = @top_srcdir@
- @TOOLKIT_GTK_TRUE@ unix/libunix.la
-
- @TOOLKIT_GTK_TRUE@gdict_la_LDFLAGS = \
-+@TOOLKIT_GTK_TRUE@ $(DEPS_LIBS) \
- @TOOLKIT_GTK_TRUE@ $(GDICT_LIBS) \
- @TOOLKIT_GTK_TRUE@ -avoid-version \
- @TOOLKIT_GTK_TRUE@ -module \
- @TOOLKIT_GTK_TRUE@ -no-undefined
-
- @TOOLKIT_GTK_TRUE@gdict_la_SOURCES =
-+@TOOLKIT_GTK_TRUE@nodist_EXTRA_gdict_la_SOURCES = dummy.cpp
- @TOOLKIT_GTK_TRUE@EXTRA_DIST = \
- @TOOLKIT_GTK_TRUE@ plugin.m4
-
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -514,6 +520,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -752,6 +781,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- clean-pluginLTLIBRARIES mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -797,6 +827,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/gimp/Makefile.in b/plugins/gimp/Makefile.in
-index 4e044c8..2d1724a 100644
---- a/plugins/gimp/Makefile.in
-+++ b/plugins/gimp/Makefile.in
-@@ -425,6 +425,7 @@ gimp_la_LIBADD = \
- xp/libxp.la
-
- gimp_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GIMP_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/goffice/Makefile.in b/plugins/goffice/Makefile.in
-index 7bd19e6..2a4397a 100644
---- a/plugins/goffice/Makefile.in
-+++ b/plugins/goffice/Makefile.in
-@@ -77,17 +77,20 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
- goffice_la_DEPENDENCIES = unix/libunix.la
- am_goffice_la_OBJECTS =
- goffice_la_OBJECTS = $(am_goffice_la_OBJECTS)
--goffice_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(goffice_la_LDFLAGS) $(LDFLAGS) -o $@
-+goffice_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(goffice_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(goffice_la_SOURCES)
-+SOURCES = $(goffice_la_SOURCES) $(nodist_EXTRA_goffice_la_SOURCES)
- DIST_SOURCES = $(goffice_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -419,18 +422,21 @@ goffice_la_LIBADD = \
- unix/libunix.la
-
- goffice_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GOFFICE_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-
- goffice_la_SOURCES =
-+nodist_EXTRA_goffice_la_SOURCES = dummy.cpp
- EXTRA_DIST = \
- plugin.m4
-
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -501,6 +507,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -739,6 +768,7 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -784,6 +814,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/google/Makefile.in b/plugins/google/Makefile.in
-index 4b2d830..a47a7d8 100644
---- a/plugins/google/Makefile.in
-+++ b/plugins/google/Makefile.in
-@@ -425,6 +425,7 @@ google_la_LIBADD = \
- xp/libxp.la
-
- google_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GOOGLE_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/grammar/Makefile.in b/plugins/grammar/Makefile.in
-index d3a0a11..45116c4 100644
---- a/plugins/grammar/Makefile.in
-+++ b/plugins/grammar/Makefile.in
-@@ -424,6 +424,7 @@ grammar_la_LIBADD = \
- xp/libxp.la
-
- grammar_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GRAMMAR_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/hancom/Makefile.in b/plugins/hancom/Makefile.in
-index 973dfa8..bf4f19a 100644
---- a/plugins/hancom/Makefile.in
-+++ b/plugins/hancom/Makefile.in
-@@ -425,6 +425,7 @@ hancom_la_LIBADD = \
- xp/libxp.la
-
- hancom_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(HANCOM_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/hrtext/Makefile.in b/plugins/hrtext/Makefile.in
-index efe6275..e08aae2 100644
---- a/plugins/hrtext/Makefile.in
-+++ b/plugins/hrtext/Makefile.in
-@@ -425,6 +425,7 @@ hrtext_la_LIBADD = \
- xp/libxp.la
-
- hrtext_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(HRTEXT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/iscii/Makefile.in b/plugins/iscii/Makefile.in
-index b58f378..9c87a6f 100644
---- a/plugins/iscii/Makefile.in
-+++ b/plugins/iscii/Makefile.in
-@@ -425,6 +425,7 @@ iscii_la_LIBADD = \
- xp/libxp.la
-
- iscii_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(ISCII_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/kword/Makefile.in b/plugins/kword/Makefile.in
-index ede4a73..a6dab08 100644
---- a/plugins/kword/Makefile.in
-+++ b/plugins/kword/Makefile.in
-@@ -425,6 +425,7 @@ kword_la_LIBADD = \
- xp/libxp.la
-
- kword_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(KWORD_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/latex/Makefile.in b/plugins/latex/Makefile.in
-index 6abef38..bc6ee9e 100644
---- a/plugins/latex/Makefile.in
-+++ b/plugins/latex/Makefile.in
-@@ -426,6 +426,7 @@ latex_la_LIBADD = \
- xp/libxp.la
-
- latex_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(LATEX_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/loadbindings/Makefile.in b/plugins/loadbindings/Makefile.in
-index 277874c..e322c60 100644
---- a/plugins/loadbindings/Makefile.in
-+++ b/plugins/loadbindings/Makefile.in
-@@ -427,6 +427,7 @@ loadbindings_la_LIBADD = \
- xp/libxp.la
-
- loadbindings_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(LOADBINDINGS_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mathview/Makefile.in b/plugins/mathview/Makefile.in
-index 433932c..a06406a 100644
---- a/plugins/mathview/Makefile.in
-+++ b/plugins/mathview/Makefile.in
-@@ -423,6 +423,7 @@ mathview_la_LIBADD = \
- xp/libxp.la
-
- mathview_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MATHVIEW_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mht/Makefile.in b/plugins/mht/Makefile.in
-index 84a5c99..10c51a6 100644
---- a/plugins/mht/Makefile.in
-+++ b/plugins/mht/Makefile.in
-@@ -422,6 +422,7 @@ mht_la_LIBADD = \
- xp/libxp.la
-
- mht_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MHT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mif/Makefile.in b/plugins/mif/Makefile.in
-index 0dbe6ba..c8e5711 100644
---- a/plugins/mif/Makefile.in
-+++ b/plugins/mif/Makefile.in
-@@ -425,6 +425,7 @@ mif_la_LIBADD = \
- xp/libxp.la
-
- mif_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MIF_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mswrite/Makefile.in b/plugins/mswrite/Makefile.in
-index 0a1860e..fcbd4de 100644
---- a/plugins/mswrite/Makefile.in
-+++ b/plugins/mswrite/Makefile.in
-@@ -425,6 +425,7 @@ mswrite_la_LIBADD = \
- xp/libxp.la
-
- mswrite_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MSWRITE_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/opendocument/Makefile.in b/plugins/opendocument/Makefile.in
-index f9108ae..f75cbde 100644
---- a/plugins/opendocument/Makefile.in
-+++ b/plugins/opendocument/Makefile.in
-@@ -430,6 +430,7 @@ opendocument_la_LIBADD = \
- imp/libimp.la
-
- opendocument_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPENDOCUMENT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/openwriter/Makefile.in b/plugins/openwriter/Makefile.in
-index 643c326..18ce762 100644
---- a/plugins/openwriter/Makefile.in
-+++ b/plugins/openwriter/Makefile.in
-@@ -426,6 +426,7 @@ openwriter_la_LIBADD = \
- xp/libxp.la
-
- openwriter_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPENWRITER_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/openxml/Makefile.in b/plugins/openxml/Makefile.in
-index 17ed0c2..5054053 100644
---- a/plugins/openxml/Makefile.in
-+++ b/plugins/openxml/Makefile.in
-@@ -428,6 +428,7 @@ openxml_la_LIBADD = \
- exp/libexp.la
-
- openxml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPENXML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/opml/Makefile.in b/plugins/opml/Makefile.in
-index aad4e48..ef78675 100644
---- a/plugins/opml/Makefile.in
-+++ b/plugins/opml/Makefile.in
-@@ -425,6 +425,7 @@ opml_la_LIBADD = \
- xp/libxp.la
-
- opml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/ots/Makefile.in b/plugins/ots/Makefile.in
-index 46954df..91145f0 100644
---- a/plugins/ots/Makefile.in
-+++ b/plugins/ots/Makefile.in
-@@ -77,17 +77,20 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
- ots_la_DEPENDENCIES = xp/libxp.la
- am_ots_la_OBJECTS =
- ots_la_OBJECTS = $(am_ots_la_OBJECTS)
--ots_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ots_la_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+ots_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+ $(ots_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(ots_la_SOURCES)
-+SOURCES = $(ots_la_SOURCES) $(nodist_EXTRA_ots_la_SOURCES)
- DIST_SOURCES = $(ots_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -419,18 +422,21 @@ ots_la_LIBADD = \
- xp/libxp.la
-
- ots_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OTS_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-
- ots_la_SOURCES =
-+nodist_EXTRA_ots_la_SOURCES = dummy.cpp
- EXTRA_DIST = \
- plugin.m4
-
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -501,6 +507,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -739,6 +768,7 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -784,6 +814,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/paint/Makefile.in b/plugins/paint/Makefile.in
-index 60af0cb..f18fced 100644
---- a/plugins/paint/Makefile.in
-+++ b/plugins/paint/Makefile.in
-@@ -426,6 +426,7 @@ paint_la_LIBADD = \
- xp/libxp.la
-
- paint_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PAINT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/passepartout/Makefile.in b/plugins/passepartout/Makefile.in
-index fb7ca19..b5de4f9 100644
---- a/plugins/passepartout/Makefile.in
-+++ b/plugins/passepartout/Makefile.in
-@@ -427,6 +427,7 @@ passepartout_la_LIBADD = \
- xp/libxp.la
-
- passepartout_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PASSEPARTOUT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/pdb/Makefile.in b/plugins/pdb/Makefile.in
-index 24069a3..7ec7e69 100644
---- a/plugins/pdb/Makefile.in
-+++ b/plugins/pdb/Makefile.in
-@@ -425,6 +425,7 @@ pdb_la_LIBADD = \
- xp/libxp.la
-
- pdb_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PDB_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/pdf/Makefile.in b/plugins/pdf/Makefile.in
-index 535494e..1b42c6f 100644
---- a/plugins/pdf/Makefile.in
-+++ b/plugins/pdf/Makefile.in
-@@ -425,6 +425,7 @@ pdf_la_LIBADD = \
- xp/libxp.la
-
- pdf_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PDF_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/presentation/Makefile.in b/plugins/presentation/Makefile.in
-index 3bc303a..44db96d 100644
---- a/plugins/presentation/Makefile.in
-+++ b/plugins/presentation/Makefile.in
-@@ -427,6 +427,7 @@ presentation_la_LIBADD = \
- xp/libxp.la
-
- presentation_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PRESENTATION_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/psion/Makefile.in b/plugins/psion/Makefile.in
-index 055677f..516761f 100644
---- a/plugins/psion/Makefile.in
-+++ b/plugins/psion/Makefile.in
-@@ -78,17 +78,20 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
- psion_la_DEPENDENCIES = xp/libxp.la
- am_psion_la_OBJECTS =
- psion_la_OBJECTS = $(am_psion_la_OBJECTS)
--psion_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(psion_la_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+psion_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(psion_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(psion_la_SOURCES)
-+SOURCES = $(psion_la_SOURCES) $(nodist_EXTRA_psion_la_SOURCES)
- DIST_SOURCES = $(psion_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-@@ -421,12 +424,14 @@ psion_la_LIBADD = \
- xp/libxp.la
-
- psion_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PSION_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-
- psion_la_SOURCES =
-+nodist_EXTRA_psion_la_SOURCES = dummy.cpp
- EXTRA_DIST = \
- plugin.m4
-
-@@ -441,6 +446,7 @@ EXTRA_DIST = \
- all: all-recursive
-
- .SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
-@@ -511,6 +517,29 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-+
-+.cpp.o:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
-@@ -770,6 +799,7 @@ clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
- distclean: distclean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-@@ -815,6 +845,7 @@ install-ps-am:
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-+ -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
-diff --git a/plugins/rsvg/Makefile.in b/plugins/rsvg/Makefile.in
-index 1a0589a..9d26924 100644
---- a/plugins/rsvg/Makefile.in
-+++ b/plugins/rsvg/Makefile.in
-@@ -425,6 +425,7 @@ rsvg_la_LIBADD = \
- $(RSVG_LIBS) $(PNG_LIBS)
-
- rsvg_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-diff --git a/plugins/s5/Makefile.in b/plugins/s5/Makefile.in
-index f1c69a2..9515df2 100644
---- a/plugins/s5/Makefile.in
-+++ b/plugins/s5/Makefile.in
-@@ -425,6 +425,7 @@ s5_la_LIBADD = \
- xp/libxp.la
-
- s5_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(S5_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/sdw/Makefile.in b/plugins/sdw/Makefile.in
-index 01702b2..8ccda3e 100644
---- a/plugins/sdw/Makefile.in
-+++ b/plugins/sdw/Makefile.in
-@@ -425,6 +425,7 @@ sdw_la_LIBADD = \
- xp/libxp.la
-
- sdw_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(SDW_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/t602/Makefile.in b/plugins/t602/Makefile.in
-index 310c78f..d62df56 100644
---- a/plugins/t602/Makefile.in
-+++ b/plugins/t602/Makefile.in
-@@ -425,6 +425,7 @@ t602_la_LIBADD = \
- xp/libxp.la
-
- t602_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(T602_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/urldict/Makefile.in b/plugins/urldict/Makefile.in
-index 61f68ed..c37937f 100644
---- a/plugins/urldict/Makefile.in
-+++ b/plugins/urldict/Makefile.in
-@@ -425,6 +425,7 @@ urldict_la_LIBADD = \
- xp/libxp.la
-
- urldict_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(URLDICT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wikipedia/Makefile.in b/plugins/wikipedia/Makefile.in
-index 5ed0d19..ce25b63 100644
---- a/plugins/wikipedia/Makefile.in
-+++ b/plugins/wikipedia/Makefile.in
-@@ -425,6 +425,7 @@ wikipedia_la_LIBADD = \
- xp/libxp.la
-
- wikipedia_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WIKIPEDIA_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wmf/Makefile.in b/plugins/wmf/Makefile.in
-index 17f6f0e..93a5705 100644
---- a/plugins/wmf/Makefile.in
-+++ b/plugins/wmf/Makefile.in
-@@ -422,6 +422,7 @@ wmf_la_LIBADD = \
- xp/libxp.la
-
- wmf_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WMF_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wml/Makefile.in b/plugins/wml/Makefile.in
-index 04e7c4c..0de2dd1 100644
---- a/plugins/wml/Makefile.in
-+++ b/plugins/wml/Makefile.in
-@@ -425,6 +425,7 @@ wml_la_LIBADD = \
- xp/libxp.la
-
- wml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wordperfect/Makefile.in b/plugins/wordperfect/Makefile.in
-index 9d00fad..9682afa 100644
---- a/plugins/wordperfect/Makefile.in
-+++ b/plugins/wordperfect/Makefile.in
-@@ -423,6 +423,7 @@ wordperfect_la_LIBADD = \
- xp/libxp.la
-
- wordperfect_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WORDPERFECT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wpg/Makefile.in b/plugins/wpg/Makefile.in
-index 8960c9a..2babb26 100644
---- a/plugins/wpg/Makefile.in
-+++ b/plugins/wpg/Makefile.in
-@@ -422,6 +422,7 @@ wpg_la_LIBADD = \
- xp/libxp.la
-
- wpg_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WPG_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/xslfo/Makefile.in b/plugins/xslfo/Makefile.in
-index 41603d8..307a820 100644
---- a/plugins/xslfo/Makefile.in
-+++ b/plugins/xslfo/Makefile.in
-@@ -425,6 +425,7 @@ xslfo_la_LIBADD = \
- xp/libxp.la
-
- xslfo_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(XSLFO_LIBS) \
- -avoid-version \
- -module \
---
-tg: (36f8b56..) debian/rerun-automake (depends on: fixes/link-plugins-with-cxx fixes/fully-link-plugins)
diff -Nru -w abiword-2.9.1/debian/patches/fixes/fully-link-plugins.diff abiword-2.9.1/debian/patches/fixes/fully-link-plugins.diff
--- abiword-2.9.1/debian/patches/fixes/fully-link-plugins.diff 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/patches/fixes/fully-link-plugins.diff 1970-01-01 10:00:00.000000000 +1000
@@ -1,656 +0,0 @@
-From: Patrik Fimml <patrik@fimml.at>
-Subject: [PATCH] fixes/fully-link-plugins
-
-Ensure plugins are fully linked against all libraries from which they use
-functions, instead of indirectly expecting them to be linked due to their use
-of libabiword.
-
-This should
-* ensure plugins work with pyabiword (since python isn't linked against all
- these libs)
-* let us properly determine shlibs dependencies of plugins.
-
-Signed-off-by: Patrik Fimml <patrik@fimml.at>
-
----
- plugins/aiksaurus/Makefile.am | 1 +
- plugins/applix/Makefile.am | 1 +
- plugins/babelfish/Makefile.am | 1 +
- plugins/bmp/Makefile.am | 1 +
- plugins/clarisworks/Makefile.am | 1 +
- plugins/collab/Makefile.am | 1 +
- plugins/command/Makefile.am | 1 +
- plugins/docbook/Makefile.am | 1 +
- plugins/eml/Makefile.am | 1 +
- plugins/freetranslation/Makefile.am | 1 +
- plugins/garble/Makefile.am | 1 +
- plugins/gda/Makefile.am | 1 +
- plugins/gdict/Makefile.am | 1 +
- plugins/gimp/Makefile.am | 1 +
- plugins/goffice/Makefile.am | 1 +
- plugins/google/Makefile.am | 1 +
- plugins/grammar/Makefile.am | 1 +
- plugins/hancom/Makefile.am | 1 +
- plugins/hrtext/Makefile.am | 1 +
- plugins/iscii/Makefile.am | 1 +
- plugins/kword/Makefile.am | 1 +
- plugins/latex/Makefile.am | 1 +
- plugins/loadbindings/Makefile.am | 1 +
- plugins/mathview/Makefile.am | 1 +
- plugins/mht/Makefile.am | 1 +
- plugins/mif/Makefile.am | 1 +
- plugins/mswrite/Makefile.am | 1 +
- plugins/opendocument/Makefile.am | 1 +
- plugins/openwriter/Makefile.am | 1 +
- plugins/openxml/Makefile.am | 1 +
- plugins/opml/Makefile.am | 1 +
- plugins/ots/Makefile.am | 1 +
- plugins/paint/Makefile.am | 1 +
- plugins/passepartout/Makefile.am | 1 +
- plugins/pdb/Makefile.am | 1 +
- plugins/pdf/Makefile.am | 1 +
- plugins/presentation/Makefile.am | 1 +
- plugins/psion/Makefile.am | 1 +
- plugins/rsvg/Makefile.am | 1 +
- plugins/s5/Makefile.am | 1 +
- plugins/sdw/Makefile.am | 1 +
- plugins/t602/Makefile.am | 1 +
- plugins/urldict/Makefile.am | 1 +
- plugins/wikipedia/Makefile.am | 1 +
- plugins/wmf/Makefile.am | 1 +
- plugins/wml/Makefile.am | 1 +
- plugins/wordperfect/Makefile.am | 1 +
- plugins/wpg/Makefile.am | 1 +
- plugins/xslfo/Makefile.am | 1 +
- 49 files changed, 49 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am
-index f739141..892c1a7 100644
---- a/plugins/aiksaurus/Makefile.am
-+++ b/plugins/aiksaurus/Makefile.am
-@@ -15,6 +15,7 @@ aiksaurus_la_LIBADD = \
- xp/libxp.la
-
- aiksaurus_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(AIKSAURUS_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/applix/Makefile.am b/plugins/applix/Makefile.am
-index f3eb591..2845c11 100644
---- a/plugins/applix/Makefile.am
-+++ b/plugins/applix/Makefile.am
-@@ -15,6 +15,7 @@ applix_la_LIBADD = \
- xp/libxp.la
-
- applix_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(APPLIX_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/babelfish/Makefile.am b/plugins/babelfish/Makefile.am
-index e8ddaa3..140b779 100644
---- a/plugins/babelfish/Makefile.am
-+++ b/plugins/babelfish/Makefile.am
-@@ -15,6 +15,7 @@ babelfish_la_LIBADD = \
- xp/libxp.la
-
- babelfish_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(BABELFISH_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/bmp/Makefile.am b/plugins/bmp/Makefile.am
-index be0e593..7a47588 100644
---- a/plugins/bmp/Makefile.am
-+++ b/plugins/bmp/Makefile.am
-@@ -15,6 +15,7 @@ bmp_la_LIBADD = \
- xp/libxp.la
-
- bmp_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(BMP_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/clarisworks/Makefile.am b/plugins/clarisworks/Makefile.am
-index befd9b5..71cbb92 100644
---- a/plugins/clarisworks/Makefile.am
-+++ b/plugins/clarisworks/Makefile.am
-@@ -15,6 +15,7 @@ clarisworks_la_LIBADD = \
- xp/libxp.la
-
- clarisworks_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(CLARISWORKS_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/collab/Makefile.am b/plugins/collab/Makefile.am
-index 1e988b3..02dba9d 100644
---- a/plugins/collab/Makefile.am
-+++ b/plugins/collab/Makefile.am
-@@ -18,6 +18,7 @@ collab_la_LIBADD = \
- core/libcore.la
-
- collab_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(COLLAB_LIBS) \
- $(SYSTEM_LIBS) \
- -avoid-version \
-diff --git a/plugins/command/Makefile.am b/plugins/command/Makefile.am
-index 6605228..0f22f0e 100644
---- a/plugins/command/Makefile.am
-+++ b/plugins/command/Makefile.am
-@@ -10,6 +10,7 @@ command_la_LIBADD = \
- xp/libxp.la
-
- command_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(COMMAND_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/docbook/Makefile.am b/plugins/docbook/Makefile.am
-index 679a6ce..1cea42b 100644
---- a/plugins/docbook/Makefile.am
-+++ b/plugins/docbook/Makefile.am
-@@ -15,6 +15,7 @@ docbook_la_LIBADD = \
- xp/libxp.la
-
- docbook_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(DOCBOOK_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/eml/Makefile.am b/plugins/eml/Makefile.am
-index 0e8dcc8..7e038a7 100644
---- a/plugins/eml/Makefile.am
-+++ b/plugins/eml/Makefile.am
-@@ -15,6 +15,7 @@ eml_la_LIBADD = \
- xp/libxp.la
-
- eml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(EML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/freetranslation/Makefile.am b/plugins/freetranslation/Makefile.am
-index 73446bc..ccadde2 100644
---- a/plugins/freetranslation/Makefile.am
-+++ b/plugins/freetranslation/Makefile.am
-@@ -15,6 +15,7 @@ freetranslation_la_LIBADD = \
- xp/libxp.la
-
- freetranslation_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(FREETRANSLATION_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/garble/Makefile.am b/plugins/garble/Makefile.am
-index 585e76e..ca7c154 100644
---- a/plugins/garble/Makefile.am
-+++ b/plugins/garble/Makefile.am
-@@ -11,6 +11,7 @@ garble_la_LIBADD = \
- $(GARBLE_LIBS) $(PNG_LIBS) -ljpeg
-
- garble_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GARBLE_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/gda/Makefile.am b/plugins/gda/Makefile.am
-index 2050e7b..c84c7fc 100644
---- a/plugins/gda/Makefile.am
-+++ b/plugins/gda/Makefile.am
-@@ -8,6 +8,7 @@ gda_la_LIBADD = \
- unix/libunix.la
-
- gda_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GDA_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/gdict/Makefile.am b/plugins/gdict/Makefile.am
-index 13d6945..26dc68f 100644
---- a/plugins/gdict/Makefile.am
-+++ b/plugins/gdict/Makefile.am
-@@ -15,6 +15,7 @@ gdict_la_LIBADD = \
- unix/libunix.la
-
- gdict_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GDICT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/gimp/Makefile.am b/plugins/gimp/Makefile.am
-index 7b5362b..cc5f768 100644
---- a/plugins/gimp/Makefile.am
-+++ b/plugins/gimp/Makefile.am
-@@ -15,6 +15,7 @@ gimp_la_LIBADD = \
- xp/libxp.la
-
- gimp_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GIMP_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/goffice/Makefile.am b/plugins/goffice/Makefile.am
-index 98547de..4ec7f7b 100644
---- a/plugins/goffice/Makefile.am
-+++ b/plugins/goffice/Makefile.am
-@@ -8,6 +8,7 @@ goffice_la_LIBADD = \
- unix/libunix.la
-
- goffice_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GOFFICE_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/google/Makefile.am b/plugins/google/Makefile.am
-index 6692889..9441af7 100644
---- a/plugins/google/Makefile.am
-+++ b/plugins/google/Makefile.am
-@@ -15,6 +15,7 @@ google_la_LIBADD = \
- xp/libxp.la
-
- google_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GOOGLE_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/grammar/Makefile.am b/plugins/grammar/Makefile.am
-index 72a7a66..7c2ee03 100644
---- a/plugins/grammar/Makefile.am
-+++ b/plugins/grammar/Makefile.am
-@@ -9,6 +9,7 @@ grammar_la_LIBADD = \
- xp/libxp.la
-
- grammar_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(GRAMMAR_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/hancom/Makefile.am b/plugins/hancom/Makefile.am
-index a28571c..122b31a 100644
---- a/plugins/hancom/Makefile.am
-+++ b/plugins/hancom/Makefile.am
-@@ -15,6 +15,7 @@ hancom_la_LIBADD = \
- xp/libxp.la
-
- hancom_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(HANCOM_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/hrtext/Makefile.am b/plugins/hrtext/Makefile.am
-index 7886bcd..3cbf974 100644
---- a/plugins/hrtext/Makefile.am
-+++ b/plugins/hrtext/Makefile.am
-@@ -15,6 +15,7 @@ hrtext_la_LIBADD = \
- xp/libxp.la
-
- hrtext_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(HRTEXT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/iscii/Makefile.am b/plugins/iscii/Makefile.am
-index 2ae355c..fb92eb6 100644
---- a/plugins/iscii/Makefile.am
-+++ b/plugins/iscii/Makefile.am
-@@ -15,6 +15,7 @@ iscii_la_LIBADD = \
- xp/libxp.la
-
- iscii_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(ISCII_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/kword/Makefile.am b/plugins/kword/Makefile.am
-index 45cc30d..0491f61 100644
---- a/plugins/kword/Makefile.am
-+++ b/plugins/kword/Makefile.am
-@@ -15,6 +15,7 @@ kword_la_LIBADD = \
- xp/libxp.la
-
- kword_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(KWORD_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/latex/Makefile.am b/plugins/latex/Makefile.am
-index b983816..9948495 100644
---- a/plugins/latex/Makefile.am
-+++ b/plugins/latex/Makefile.am
-@@ -19,6 +19,7 @@ latex_la_LIBADD = \
- xp/libxp.la
-
- latex_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(LATEX_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/loadbindings/Makefile.am b/plugins/loadbindings/Makefile.am
-index dacd70b..2ddaf76 100644
---- a/plugins/loadbindings/Makefile.am
-+++ b/plugins/loadbindings/Makefile.am
-@@ -15,6 +15,7 @@ loadbindings_la_LIBADD = \
- xp/libxp.la
-
- loadbindings_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(LOADBINDINGS_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mathview/Makefile.am b/plugins/mathview/Makefile.am
-index 6af423f..b5f580b 100644
---- a/plugins/mathview/Makefile.am
-+++ b/plugins/mathview/Makefile.am
-@@ -9,6 +9,7 @@ mathview_la_LIBADD = \
- xp/libxp.la
-
- mathview_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MATHVIEW_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mht/Makefile.am b/plugins/mht/Makefile.am
-index 8a99530..d5c94fc 100644
---- a/plugins/mht/Makefile.am
-+++ b/plugins/mht/Makefile.am
-@@ -8,6 +8,7 @@ mht_la_LIBADD = \
- xp/libxp.la
-
- mht_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MHT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mif/Makefile.am b/plugins/mif/Makefile.am
-index 121b844..a1660df 100644
---- a/plugins/mif/Makefile.am
-+++ b/plugins/mif/Makefile.am
-@@ -15,6 +15,7 @@ mif_la_LIBADD = \
- xp/libxp.la
-
- mif_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MIF_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/mswrite/Makefile.am b/plugins/mswrite/Makefile.am
-index 3e26152..afe529e 100644
---- a/plugins/mswrite/Makefile.am
-+++ b/plugins/mswrite/Makefile.am
-@@ -15,6 +15,7 @@ mswrite_la_LIBADD = \
- xp/libxp.la
-
- mswrite_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(MSWRITE_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/opendocument/Makefile.am b/plugins/opendocument/Makefile.am
-index e90136f..907d40d 100644
---- a/plugins/opendocument/Makefile.am
-+++ b/plugins/opendocument/Makefile.am
-@@ -17,6 +17,7 @@ opendocument_la_LIBADD = \
- imp/libimp.la
-
- opendocument_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPENDOCUMENT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/openwriter/Makefile.am b/plugins/openwriter/Makefile.am
-index 198209b..81a65ea 100644
---- a/plugins/openwriter/Makefile.am
-+++ b/plugins/openwriter/Makefile.am
-@@ -15,6 +15,7 @@ openwriter_la_LIBADD = \
- xp/libxp.la
-
- openwriter_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPENWRITER_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/openxml/Makefile.am b/plugins/openxml/Makefile.am
-index 9fe934a..1fba8d0 100644
---- a/plugins/openxml/Makefile.am
-+++ b/plugins/openxml/Makefile.am
-@@ -17,6 +17,7 @@ openxml_la_LIBADD = \
- exp/libexp.la
-
- openxml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPENXML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/opml/Makefile.am b/plugins/opml/Makefile.am
-index 048ce2d..92ceb5b 100644
---- a/plugins/opml/Makefile.am
-+++ b/plugins/opml/Makefile.am
-@@ -15,6 +15,7 @@ opml_la_LIBADD = \
- xp/libxp.la
-
- opml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OPML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/ots/Makefile.am b/plugins/ots/Makefile.am
-index d8a165c..1d9c438 100644
---- a/plugins/ots/Makefile.am
-+++ b/plugins/ots/Makefile.am
-@@ -8,6 +8,7 @@ ots_la_LIBADD = \
- xp/libxp.la
-
- ots_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(OTS_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/paint/Makefile.am b/plugins/paint/Makefile.am
-index b3da60a..5346b06 100644
---- a/plugins/paint/Makefile.am
-+++ b/plugins/paint/Makefile.am
-@@ -17,6 +17,7 @@ paint_la_LIBADD = \
- xp/libxp.la
-
- paint_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PAINT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/passepartout/Makefile.am b/plugins/passepartout/Makefile.am
-index 1646347..c0c496d 100644
---- a/plugins/passepartout/Makefile.am
-+++ b/plugins/passepartout/Makefile.am
-@@ -15,6 +15,7 @@ passepartout_la_LIBADD = \
- xp/libxp.la
-
- passepartout_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PASSEPARTOUT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/pdb/Makefile.am b/plugins/pdb/Makefile.am
-index 46a5760..04fd4dd 100644
---- a/plugins/pdb/Makefile.am
-+++ b/plugins/pdb/Makefile.am
-@@ -15,6 +15,7 @@ pdb_la_LIBADD = \
- xp/libxp.la
-
- pdb_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PDB_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/pdf/Makefile.am b/plugins/pdf/Makefile.am
-index 9f1ff89..8dc5866 100644
---- a/plugins/pdf/Makefile.am
-+++ b/plugins/pdf/Makefile.am
-@@ -15,6 +15,7 @@ pdf_la_LIBADD = \
- xp/libxp.la
-
- pdf_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PDF_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/presentation/Makefile.am b/plugins/presentation/Makefile.am
-index b4c170b..8bea087 100644
---- a/plugins/presentation/Makefile.am
-+++ b/plugins/presentation/Makefile.am
-@@ -15,6 +15,7 @@ presentation_la_LIBADD = \
- xp/libxp.la
-
- presentation_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PRESENTATION_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/psion/Makefile.am b/plugins/psion/Makefile.am
-index cee6b01..a216aba 100644
---- a/plugins/psion/Makefile.am
-+++ b/plugins/psion/Makefile.am
-@@ -8,6 +8,7 @@ psion_la_LIBADD = \
- xp/libxp.la
-
- psion_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(PSION_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/rsvg/Makefile.am b/plugins/rsvg/Makefile.am
-index 4c6c5b9..cf01870 100644
---- a/plugins/rsvg/Makefile.am
-+++ b/plugins/rsvg/Makefile.am
-@@ -9,6 +9,7 @@ rsvg_la_LIBADD = \
- $(RSVG_LIBS) $(PNG_LIBS)
-
- rsvg_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- -avoid-version \
- -module \
- -no-undefined
-diff --git a/plugins/s5/Makefile.am b/plugins/s5/Makefile.am
-index e1a580f..1aae683 100644
---- a/plugins/s5/Makefile.am
-+++ b/plugins/s5/Makefile.am
-@@ -15,6 +15,7 @@ s5_la_LIBADD = \
- xp/libxp.la
-
- s5_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(S5_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/sdw/Makefile.am b/plugins/sdw/Makefile.am
-index 0d2da27..d7c096f 100644
---- a/plugins/sdw/Makefile.am
-+++ b/plugins/sdw/Makefile.am
-@@ -15,6 +15,7 @@ sdw_la_LIBADD = \
- xp/libxp.la
-
- sdw_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(SDW_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/t602/Makefile.am b/plugins/t602/Makefile.am
-index a67de03..023dca8 100644
---- a/plugins/t602/Makefile.am
-+++ b/plugins/t602/Makefile.am
-@@ -15,6 +15,7 @@ t602_la_LIBADD = \
- xp/libxp.la
-
- t602_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(T602_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/urldict/Makefile.am b/plugins/urldict/Makefile.am
-index 7a26645..1834e6f 100644
---- a/plugins/urldict/Makefile.am
-+++ b/plugins/urldict/Makefile.am
-@@ -15,6 +15,7 @@ urldict_la_LIBADD = \
- xp/libxp.la
-
- urldict_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(URLDICT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wikipedia/Makefile.am b/plugins/wikipedia/Makefile.am
-index de83733..c8c5e2b 100644
---- a/plugins/wikipedia/Makefile.am
-+++ b/plugins/wikipedia/Makefile.am
-@@ -15,6 +15,7 @@ wikipedia_la_LIBADD = \
- xp/libxp.la
-
- wikipedia_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WIKIPEDIA_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wmf/Makefile.am b/plugins/wmf/Makefile.am
-index b98f084..c44c7c8 100644
---- a/plugins/wmf/Makefile.am
-+++ b/plugins/wmf/Makefile.am
-@@ -8,6 +8,7 @@ wmf_la_LIBADD = \
- xp/libxp.la
-
- wmf_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WMF_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wml/Makefile.am b/plugins/wml/Makefile.am
-index 7287af5..c086996 100644
---- a/plugins/wml/Makefile.am
-+++ b/plugins/wml/Makefile.am
-@@ -15,6 +15,7 @@ wml_la_LIBADD = \
- xp/libxp.la
-
- wml_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WML_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wordperfect/Makefile.am b/plugins/wordperfect/Makefile.am
-index ad9f1c1..73e64aa 100644
---- a/plugins/wordperfect/Makefile.am
-+++ b/plugins/wordperfect/Makefile.am
-@@ -8,6 +8,7 @@ wordperfect_la_LIBADD = \
- xp/libxp.la
-
- wordperfect_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WORDPERFECT_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/wpg/Makefile.am b/plugins/wpg/Makefile.am
-index d1480be..99cf980 100644
---- a/plugins/wpg/Makefile.am
-+++ b/plugins/wpg/Makefile.am
-@@ -8,6 +8,7 @@ wpg_la_LIBADD = \
- xp/libxp.la
-
- wpg_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(WPG_LIBS) \
- -avoid-version \
- -module \
-diff --git a/plugins/xslfo/Makefile.am b/plugins/xslfo/Makefile.am
-index 0b2b7f3..9c410cc 100644
---- a/plugins/xslfo/Makefile.am
-+++ b/plugins/xslfo/Makefile.am
-@@ -15,6 +15,7 @@ xslfo_la_LIBADD = \
- xp/libxp.la
-
- xslfo_la_LDFLAGS = \
-+ $(DEPS_LIBS) \
- $(XSLFO_LIBS) \
- -avoid-version \
- -module \
---
-tg: (a60ef3b..) fixes/fully-link-plugins (depends on: master)
diff -Nru -w abiword-2.9.1/debian/patches/fixes/link-plugins-with-cxx.diff abiword-2.9.1/debian/patches/fixes/link-plugins-with-cxx.diff
--- abiword-2.9.1/debian/patches/fixes/link-plugins-with-cxx.diff 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/patches/fixes/link-plugins-with-cxx.diff 1970-01-01 10:00:00.000000000 +1000
@@ -1,100 +0,0 @@
-From: Patrik Fimml <patrik@fimml.at>
-Subject: [PATCH] fixes/link-plugins-with-cxx
-
-Make automake think plugins are C++ targets, so it links them properly.
-
-Signed-off-by: Patrik Fimml <patrik@fimml.at>
-
----
- plugins/aiksaurus/Makefile.am | 1 +
- plugins/command/Makefile.am | 1 +
- plugins/gda/Makefile.am | 1 +
- plugins/gdict/Makefile.am | 1 +
- plugins/goffice/Makefile.am | 1 +
- plugins/ots/Makefile.am | 1 +
- plugins/psion/Makefile.am | 1 +
- 7 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am
-index 892c1a7..77fa8b6 100644
---- a/plugins/aiksaurus/Makefile.am
-+++ b/plugins/aiksaurus/Makefile.am
-@@ -22,4 +22,5 @@ aiksaurus_la_LDFLAGS = \
- -no-undefined
-
- aiksaurus_la_SOURCES =
-+nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
-
-diff --git a/plugins/command/Makefile.am b/plugins/command/Makefile.am
-index 0f22f0e..4315bb9 100644
---- a/plugins/command/Makefile.am
-+++ b/plugins/command/Makefile.am
-@@ -17,5 +17,6 @@ command_la_LDFLAGS = \
- -no-undefined
-
- command_la_SOURCES =
-+nodist_EXTRA_command_la_SOURCES = dummy.cpp
-
- endif
-diff --git a/plugins/gda/Makefile.am b/plugins/gda/Makefile.am
-index c84c7fc..965191a 100644
---- a/plugins/gda/Makefile.am
-+++ b/plugins/gda/Makefile.am
-@@ -15,6 +15,7 @@ gda_la_LDFLAGS = \
- -no-undefined
-
- gda_la_SOURCES =
-+nodist_EXTRA_gda_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
-diff --git a/plugins/gdict/Makefile.am b/plugins/gdict/Makefile.am
-index 26dc68f..e96edff 100644
---- a/plugins/gdict/Makefile.am
-+++ b/plugins/gdict/Makefile.am
-@@ -22,6 +22,7 @@ gdict_la_LDFLAGS = \
- -no-undefined
-
- gdict_la_SOURCES =
-+nodist_EXTRA_gdict_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
-diff --git a/plugins/goffice/Makefile.am b/plugins/goffice/Makefile.am
-index 4ec7f7b..8dd92ad 100644
---- a/plugins/goffice/Makefile.am
-+++ b/plugins/goffice/Makefile.am
-@@ -15,6 +15,7 @@ goffice_la_LDFLAGS = \
- -no-undefined
-
- goffice_la_SOURCES =
-+nodist_EXTRA_goffice_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
-diff --git a/plugins/ots/Makefile.am b/plugins/ots/Makefile.am
-index 1d9c438..3754978 100644
---- a/plugins/ots/Makefile.am
-+++ b/plugins/ots/Makefile.am
-@@ -15,6 +15,7 @@ ots_la_LDFLAGS = \
- -no-undefined
-
- ots_la_SOURCES =
-+nodist_EXTRA_ots_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
-diff --git a/plugins/psion/Makefile.am b/plugins/psion/Makefile.am
-index a216aba..3db02ac 100644
---- a/plugins/psion/Makefile.am
-+++ b/plugins/psion/Makefile.am
-@@ -15,6 +15,7 @@ psion_la_LDFLAGS = \
- -no-undefined
-
- psion_la_SOURCES =
-+nodist_EXTRA_psion_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
---
-tg: (a6c4321..) fixes/link-plugins-with-cxx (depends on: master fixes/fully-link-plugins)
diff -Nru -w abiword-2.9.1/debian/patches/fix_no_undefined.diff abiword-2.9.1/debian/patches/fix_no_undefined.diff
--- abiword-2.9.1/debian/patches/fix_no_undefined.diff 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/patches/fix_no_undefined.diff 1970-01-01 10:00:00.000000000 +1000
@@ -1,22 +0,0 @@
-Index: abiword-2.9.1/src/Makefile.in
-===================================================================
---- abiword-2.9.1.orig/src/Makefile.in 2011-07-07 19:24:14.000000000 +0000
-+++ abiword-2.9.1/src/Makefile.in 2011-10-20 01:00:43.000000000 +0000
-@@ -513,7 +513,7 @@
- $(WP_CPPFLAGS) \
- -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
-
--libabiword_@ABIWORD_SERIES@_la_LDFLAGS = $(DEPS_LIBS) -no-undefined \
-+libabiword_@ABIWORD_SERIES@_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined \
- -avoid-version -export-dynamic $(am__append_6)
- libabiword_@ABIWORD_SERIES@_la_LIBADD = $(opt_libs) \
- plugins/libplugins.la text/fmt/xp/libxp.la \
-@@ -548,7 +548,7 @@
-
- @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
- @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \
--@TOOLKIT_COCOA_TRUE@ -no-undefined \
-+@TOOLKIT_COCOA_TRUE@ -Wl,--no-undefined \
- @TOOLKIT_COCOA_TRUE@ -avoid-version \
- @TOOLKIT_COCOA_TRUE@ -export-dynamic \
- @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names
diff -Nru -w abiword-2.9.1/debian/patches/series abiword-2.9.1/debian/patches/series
--- abiword-2.9.1/debian/patches/series 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/patches/series 2011-11-21 15:16:18.000000000 +1100
@@ -1,11 +1,8 @@
debian/autosave.diff -p1
-debian/libtool-as-needed.diff -p1
-debian/rerun-automake.diff -p1
fixes/ctrl-comma-subscript.diff -p1
-fixes/fully-link-plugins.diff -p1
-fixes/link-plugins-with-cxx.diff -p1
fixes/mime-types-desktop.diff -p1
fixes/mime-types.diff -p1
#libwpd-0.9.diff -p0
-fix_no_undefined.diff
+##fix_no_undefined.diff
fix-format-security.patch
+624095-disable_smooth_scrolling.patch
diff -Nru -w abiword-2.9.1/debian/rules abiword-2.9.1/debian/rules
--- abiword-2.9.1/debian/rules 2011-11-09 08:53:25.000000000 +1100
+++ abiword-2.9.1/debian/rules 2011-11-21 15:21:26.000000000 +1100
@@ -4,6 +4,9 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/gnome.mk
+DEB_DH_AUTORECONF_ARGS = --as-needed
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
# workaround for http://bugs.debian.org/526392
QUILT_PATCH_DIR := debian/patches
QUILT_STAMPFN := patch
@@ -50,3 +53,5 @@
rm -f $(CURDIR)/debian/abiword/usr/lib/abiword-$(series)/plugins/mathview.*
install -m 644 $(CURDIR)/debian/misc/abiword.xpm $(CURDIR)/debian/abiword/usr/share/pixmaps
+clean::
+ $(RM) debian/*.log
Reply to: