[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-391-g3e67cbb91

jonathan at claws-mail.org jonathan at claws-mail.org
Fri Dec 31 19:14:58 UTC 2021


The branch, gtk3 has been updated
       via  3e67cbb910aa492d06c6977e212dc60b86f67975 (commit)
      from  52a3354ec9a2f285399bd0a50a6aca64cfad3800 (commit)

Summary of changes:
 .gitignore                            | 18 ++++----
 configure.ac                          | 18 --------
 manual/Makefile.am                    | 83 ++++++++++++++++++++++++++++-------
 manual/de/Makefile.am                 | 25 -----------
 manual/de/dist/Makefile.am            |  8 ----
 manual/de/dist/html/Makefile.am       | 35 ---------------
 manual/de/dist/pdf/Makefile.am        | 31 -------------
 manual/de/dist/ps/Makefile.am         | 31 -------------
 manual/de/dist/txt/Makefile.am        | 31 -------------
 manual/dist/Makefile.am               |  8 ----
 manual/dist/html/Makefile.am          | 35 ---------------
 manual/dist/pdf/Makefile.am           | 31 -------------
 manual/dist/ps/Makefile.am            | 31 -------------
 manual/dist/txt/Makefile.am           | 31 -------------
 manual/dtd/Makefile.am                |  9 ----
 manual/dtd/manual.dsl                 | 22 ----------
 manual/dtd/manual.xsl                 | 72 ------------------------------
 manual/{ => en}/account.xml           |  0
 manual/{ => en}/ack.xml               |  0
 manual/{ => en}/addrbook.xml          |  0
 manual/{ => en}/advanced.xml          |  0
 manual/{ => en}/claws-mail-manual.xml |  2 +-
 manual/{ => en}/faq.xml               |  0
 manual/{ => en}/glossary.xml          |  0
 manual/{ => en}/gpl.xml               |  0
 manual/{ => en}/handling.xml          |  0
 manual/{ => en}/intro.xml             |  0
 manual/{ => en}/keyboard.xml          |  0
 manual/{ => en}/plugins.xml           |  0
 manual/{ => en}/starting.xml          |  0
 manual/es/Makefile.am                 | 25 -----------
 manual/es/dist/Makefile.am            |  8 ----
 manual/es/dist/html/Makefile.am       | 35 ---------------
 manual/es/dist/pdf/Makefile.am        | 31 -------------
 manual/es/dist/ps/Makefile.am         | 31 -------------
 manual/es/dist/txt/Makefile.am        | 31 -------------
 manual/fr/Makefile.am                 | 25 -----------
 manual/fr/dist/Makefile.am            |  8 ----
 manual/fr/dist/html/Makefile.am       | 35 ---------------
 manual/fr/dist/pdf/Makefile.am        | 31 -------------
 manual/fr/dist/ps/Makefile.am         | 31 -------------
 manual/fr/dist/txt/Makefile.am        | 31 -------------
 manual/pl/Makefile.am                 | 25 -----------
 manual/pl/dist/Makefile.am            |  8 ----
 manual/pl/dist/html/Makefile.am       | 35 ---------------
 manual/pl/dist/pdf/Makefile.am        | 31 -------------
 manual/pl/dist/ps/Makefile.am         | 31 -------------
 manual/pl/dist/txt/Makefile.am        | 31 -------------
 48 files changed, 76 insertions(+), 928 deletions(-)
 delete mode 100644 manual/de/Makefile.am
 delete mode 100644 manual/de/dist/Makefile.am
 delete mode 100644 manual/de/dist/html/Makefile.am
 delete mode 100644 manual/de/dist/pdf/Makefile.am
 delete mode 100644 manual/de/dist/ps/Makefile.am
 delete mode 100644 manual/de/dist/txt/Makefile.am
 delete mode 100644 manual/dist/Makefile.am
 delete mode 100644 manual/dist/html/Makefile.am
 delete mode 100644 manual/dist/pdf/Makefile.am
 delete mode 100644 manual/dist/ps/Makefile.am
 delete mode 100644 manual/dist/txt/Makefile.am
 delete mode 100644 manual/dtd/Makefile.am
 delete mode 100644 manual/dtd/manual.dsl
 delete mode 100644 manual/dtd/manual.xsl
 rename manual/{ => en}/account.xml (100%)
 rename manual/{ => en}/ack.xml (100%)
 rename manual/{ => en}/addrbook.xml (100%)
 rename manual/{ => en}/advanced.xml (100%)
 rename manual/{ => en}/claws-mail-manual.xml (97%)
 rename manual/{ => en}/faq.xml (100%)
 rename manual/{ => en}/glossary.xml (100%)
 rename manual/{ => en}/gpl.xml (100%)
 rename manual/{ => en}/handling.xml (100%)
 rename manual/{ => en}/intro.xml (100%)
 rename manual/{ => en}/keyboard.xml (100%)
 rename manual/{ => en}/plugins.xml (100%)
 rename manual/{ => en}/starting.xml (100%)
 delete mode 100644 manual/es/Makefile.am
 delete mode 100644 manual/es/dist/Makefile.am
 delete mode 100644 manual/es/dist/html/Makefile.am
 delete mode 100644 manual/es/dist/pdf/Makefile.am
 delete mode 100644 manual/es/dist/ps/Makefile.am
 delete mode 100644 manual/es/dist/txt/Makefile.am
 delete mode 100644 manual/fr/Makefile.am
 delete mode 100644 manual/fr/dist/Makefile.am
 delete mode 100644 manual/fr/dist/html/Makefile.am
 delete mode 100644 manual/fr/dist/pdf/Makefile.am
 delete mode 100644 manual/fr/dist/ps/Makefile.am
 delete mode 100644 manual/fr/dist/txt/Makefile.am
 delete mode 100644 manual/pl/Makefile.am
 delete mode 100644 manual/pl/dist/Makefile.am
 delete mode 100644 manual/pl/dist/html/Makefile.am
 delete mode 100644 manual/pl/dist/pdf/Makefile.am
 delete mode 100644 manual/pl/dist/ps/Makefile.am
 delete mode 100644 manual/pl/dist/txt/Makefile.am


- Log -----------------------------------------------------------------
commit 3e67cbb910aa492d06c6977e212dc60b86f67975
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Mon Nov 29 18:51:32 2021 -0700

    Build manuals in parallel

diff --git a/.gitignore b/.gitignore
index ca76e4335..2cbed1ba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,16 +63,14 @@ Makefile.in
 /m4/uintmax_t.m4
 /m4/ulongulong.m4
 /m4/intltool.m4
-/manual/*/dist/claws-mail-manual.*
-/manual/*/dist/html/claws-mail-manual.*
-/manual/*/dist/pdf/claws-mail-manual.*
-/manual/*/dist/ps/claws-mail-manual.*
-/manual/*/dist/txt/claws-mail-manual.*
-/manual/dist/claws-mail-manual.*
-/manual/dist/html/claws-mail-manual.*
-/manual/dist/pdf/claws-mail-manual.*
-/manual/dist/ps/claws-mail-manual.*
-/manual/dist/txt/claws-mail-manual.*
+/manual/*/claws-mail-manual.html
+/manual/*/claws-mail-manual.pdf
+/manual/*/claws-mail-manual.ps
+/manual/*/claws-mail-manual.txt
+/manual/*/html
+/manual/*/pdf
+/manual/*/ps
+/manual/*/txt
 /patches
 /*.patchset
 /po/boldquot.sed
diff --git a/configure.ac b/configure.ac
index 77a0aca68..1ba4b87ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2206,24 +2206,6 @@ doc/man/Makefile
 tools/Makefile
 config/Makefile
 manual/Makefile
-manual/dtd/Makefile
-manual/dist/Makefile
-manual/dist/pdf/Makefile
-manual/dist/ps/Makefile
-manual/dist/html/Makefile
-manual/dist/txt/Makefile
-manual/fr/Makefile
-manual/fr/dist/Makefile
-manual/fr/dist/pdf/Makefile
-manual/fr/dist/ps/Makefile
-manual/fr/dist/html/Makefile
-manual/fr/dist/txt/Makefile
-manual/es/Makefile
-manual/es/dist/Makefile
-manual/es/dist/pdf/Makefile
-manual/es/dist/ps/Makefile
-manual/es/dist/html/Makefile
-manual/es/dist/txt/Makefile
 claws-mail.pc
 ])
 
diff --git a/manual/Makefile.am b/manual/Makefile.am
index 32f249500..544311d2f 100644
--- a/manual/Makefile.am
+++ b/manual/Makefile.am
@@ -1,25 +1,76 @@
-# Copyright 1999-2014 the Claws Mail team.
+# Copyright 1999-2021 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
+LANGS=en es fr
+EXTRA_DIST=dtd $(LANGS)
+
 if BUILD_MANUAL
-SUBDIRS=dtd dist es fr
+
+HTML_MANUALS=$(foreach lang,$(LANGS),$(lang)/claws-mail-manual.html)
+PDF_MANUALS=$(foreach lang,$(LANGS),$(lang)/claws-mail-manual.pdf)
+PS_MANUALS=$(foreach lang,$(LANGS),$(lang)/claws-mail-manual.ps)
+TXT_MANUALS=$(foreach lang,$(LANGS),$(lang)/claws-mail-manual.txt)
+
+manual_deps = \
+	$(1)/claws-mail-manual.xml \
+	$(1)/account.xml \
+	$(1)/ack.xml \
+	$(1)/addrbook.xml \
+	$(1)/advanced.xml \
+	$(1)/faq.xml \
+	$(1)/glossary.xml \
+	$(1)/gpl.xml \
+	$(1)/handling.xml \
+	$(1)/intro.xml \
+	$(1)/keyboard.xml \
+	$(1)/plugins.xml \
+	$(1)/starting.xml
+
+define HTML_template =
+$(1)/claws-mail-manual.$(2): $(manual_deps)
+	@$(MKDIR_P) $(1)/$(2)
+	SP_ENCODING=xml $(DOCBOOK2HTML) -u -o $(1)/$(2) $$<
+	$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' $(1)/$(2)/claws-mail-manual.$(2) > $$@
+	rm -rf $(1)/$(2)
+endef
+
+define BASE_template =
+$(1)/claws-mail-manual.$(2): $(manual_deps)
+	@$(MKDIR_P) $(1)/$(2)
+	$(DOCBOOK2PDF) -b $(2) -o $(1)/$(2) $$<
+	mv -f $(1)/$(2)/claws-mail-manual.$(2) $$@
+	rm -rf $(1)/$(2)
+endef
+
+if MANUAL_HTML
+nobase_dist_manualhtml_DATA=$(HTML_MANUALS)
+manualhtmldir=$(manualdir)
+$(foreach lang,$(LANGS),$(eval $(call HTML_template,$(lang),html)))
+endif
+
+if MANUAL_PDF
+nobase_dist_manualpdf_DATA=$(PDF_MANUALS)
+manualpdfdir=$(manualdir)
+$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),pdf)))
+endif
+
+if MANUAL_PS
+nobase_dist_manualps_DATA=$(PS_MANUALS)
+manualpsdir=$(manualdir)
+$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),ps)))
 endif
 
-EXTRA_DIST = \
-	account.xml \
-	ack.xml \
-	addrbook.xml \
-	advanced.xml \
-	faq.xml \
-	glossary.xml \
-	gpl.xml \
-	handling.xml \
-	intro.xml \
-	keyboard.xml \
-	plugins.xml \
-	starting.xml \
-	claws-mail-manual.xml
+if MANUAL_TXT
+nobase_dist_manualtxt_DATA=$(TXT_MANUALS)
+manualtxtdir=$(manualdir)
+$(foreach lang,$(LANGS),$(eval $(call BASE_template,$(lang),txt)))
+endif
+
+maintainer-clean:
+	-rm -f $(HTML_MANUALS) $(PDF_MANUALS) $(PS_MANUALS) $(TXT_MANUALS)
+
+endif
 
 .PHONY: test
diff --git a/manual/de/Makefile.am b/manual/de/Makefile.am
deleted file mode 100644
index 1a605a69a..000000000
--- a/manual/de/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if BUILD_MANUAL
-SUBDIRS=dist
-endif
-
-EXTRA_DIST = \
-	account.xml \
-	ack.xml \
-	addrbook.xml \
-	advanced.xml \
-	faq.xml \
-	glossary.xml \
-	gpl.xml \
-	handling.xml \
-	intro.xml \
-	keyboard.xml \
-	plugins.xml \
-	starting.xml \
-	claws-mail-manual.xml
-
-.PHONY: test
diff --git a/manual/de/dist/Makefile.am b/manual/de/dist/Makefile.am
deleted file mode 100644
index c19a2fde7..000000000
--- a/manual/de/dist/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-SUBDIRS=html pdf ps txt
-
-.PHONY: test
diff --git a/manual/de/dist/html/Makefile.am b/manual/de/dist/html/Makefile.am
deleted file mode 100644
index 705cd9265..000000000
--- a/manual/de/dist/html/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_HTML
-EXTRA_DIST=claws-mail-manual.html
-manualde_DATA=claws-mail-manual.html
-manualdedir=$(manualdir)/de
-
-claws-mail-manual.html: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
-		$(srcdir)/../../claws-mail-manual.xml
-	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
-	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
-	
-maintainer-clean:
-	-rm claws-mail-manual.html
-	-rm claws-mail-manual.html.raw
-endif
-
-.PHONY: test
diff --git a/manual/de/dist/pdf/Makefile.am b/manual/de/dist/pdf/Makefile.am
deleted file mode 100644
index d34fc4a5b..000000000
--- a/manual/de/dist/pdf/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PDF
-EXTRA_DIST=claws-mail-manual.pdf
-manualde_DATA=claws-mail-manual.pdf
-manualdedir=$(manualdir)/de
-
-claws-mail-manual.pdf: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
-endif
-
-.PHONY: test
diff --git a/manual/de/dist/ps/Makefile.am b/manual/de/dist/ps/Makefile.am
deleted file mode 100644
index 5c4f0f4cc..000000000
--- a/manual/de/dist/ps/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PS
-EXTRA_DIST=claws-mail-manual.ps
-manualde_DATA=claws-mail-manual.ps
-manualdedir=$(manualdir)/de
-
-claws-mail-manual.ps: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.ps
-endif
-
-.PHONY: test
diff --git a/manual/de/dist/txt/Makefile.am b/manual/de/dist/txt/Makefile.am
deleted file mode 100644
index f15539f60..000000000
--- a/manual/de/dist/txt/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_TXT
-EXTRA_DIST=claws-mail-manual.txt
-manualde_DATA=claws-mail-manual.txt
-manualdedir=$(manualdir)/de
-
-claws-mail-manual.txt: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2TXT) -o . $(srcdir)/../../claws-mail-manual.xml
-	
-maintainer-clean:
-	-rm claws-mail-manual.txt
-endif
-
-.PHONY: test
diff --git a/manual/dist/Makefile.am b/manual/dist/Makefile.am
deleted file mode 100644
index c19a2fde7..000000000
--- a/manual/dist/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-SUBDIRS=html pdf ps txt
-
-.PHONY: test
diff --git a/manual/dist/html/Makefile.am b/manual/dist/html/Makefile.am
deleted file mode 100644
index c863a74d9..000000000
--- a/manual/dist/html/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_HTML
-EXTRA_DIST=claws-mail-manual.html
-manualde_DATA=claws-mail-manual.html
-manualdedir=$(manualdir)/en
-
-claws-mail-manual.html: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
-		$(srcdir)/../../claws-mail-manual.xml
-	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
-	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
-	
-maintainer-clean:
-	-rm claws-mail-manual.html
-	-rm claws-mail-manual.html.raw
-endif
-
-.PHONY: test
diff --git a/manual/dist/pdf/Makefile.am b/manual/dist/pdf/Makefile.am
deleted file mode 100644
index b527db569..000000000
--- a/manual/dist/pdf/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PDF
-EXTRA_DIST=claws-mail-manual.pdf
-manualde_DATA=claws-mail-manual.pdf
-manualdedir=$(manualdir)/en
-
-claws-mail-manual.pdf: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml
-	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
-endif
-
-.PHONY: test
diff --git a/manual/dist/ps/Makefile.am b/manual/dist/ps/Makefile.am
deleted file mode 100644
index 9d27ca8c1..000000000
--- a/manual/dist/ps/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PS
-EXTRA_DIST=claws-mail-manual.ps
-manualde_DATA=claws-mail-manual.ps
-manualdedir=$(manualdir)/en
-
-claws-mail-manual.ps: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.ps
-endif
-
-.PHONY: test
diff --git a/manual/dist/txt/Makefile.am b/manual/dist/txt/Makefile.am
deleted file mode 100644
index 755a4a7b7..000000000
--- a/manual/dist/txt/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_TXT
-EXTRA_DIST=claws-mail-manual.txt
-manualde_DATA=claws-mail-manual.txt
-manualdedir=$(manualdir)/en
-
-claws-mail-manual.txt: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2TXT) -o . $(srcdir)/../../claws-mail-manual.xml
-	
-maintainer-clean:
-	-rm claws-mail-manual.txt
-endif
-
-.PHONY: test
diff --git a/manual/dtd/Makefile.am b/manual/dtd/Makefile.am
deleted file mode 100644
index 024b07fe9..000000000
--- a/manual/dtd/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-EXTRA_DIST= \
-	manual.dsl  sdocbook.dtd
-
-.PHONY: test
diff --git a/manual/dtd/manual.dsl b/manual/dtd/manual.dsl
deleted file mode 100644
index 2e4f5b186..000000000
--- a/manual/dtd/manual.dsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY html-ss
-  PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA dsssl>
-<!ENTITY print-ss
-  PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA dsssl>
-]>
-    
-<style-sheet>
-  <style-specification id="print" use="print-stylesheet">
-    <style-specification-body> 
-      (define %paper-type% "A4")
-      (define %default-quadding% 'justify)
-    </style-specification-body>
-  </style-specification>
-  <style-specification id="html" use="html-stylesheet">
-    <style-specification-body> 
-    </style-specification-body>
-  </style-specification>
-  <external-specification id="print-stylesheet" document="print-ss">
-  <external-specification id="html-stylesheet" document="html-ss">
-</style-sheet>
-
diff --git a/manual/dtd/manual.xsl b/manual/dtd/manual.xsl
deleted file mode 100644
index e75a71268..000000000
--- a/manual/dtd/manual.xsl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<xsl:import href="@DOCBOOK_XSL_PATH@/fo/docbook.xsl"/>
-
-<xsl:param name="fop1.extensions" select="1"/>
-<xsl:param name="title.margin.left" select="'0pt'"/>
-<xsl:param name="body.start.indent" select="'0pt'"/>
-<xsl:param name="variablelist.as.blocks" select="1"/>
-<xsl:param name="paper.type" select="'A4'"/>
-
-<xsl:template match="processing-instruction('hard-pagebreak')">
-   <fo:block break-before='page'/>
-</xsl:template>
- 
-<xsl:template match="appendix[@id='ap_glossary']/variablelist"
-              mode="fop1.outline">
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fo:bookmark-title>
-        <xsl:apply-templates select="*" mode="fop1.outline"/>
-      </fo:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fo:bookmark-title>
-      </fo:bookmark>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
-                         |glossary|bibliography|index|setindex
-                         |refentry
-                         |sect1|sect2|sect3|sect4|sect5|section)">
-        <fo:bookmark internal-destination="toc...{$id}">
-          <fo:bookmark-title>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fo:bookmark-title>
-        </fo:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="fop1.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/manual/account.xml b/manual/en/account.xml
similarity index 100%
rename from manual/account.xml
rename to manual/en/account.xml
diff --git a/manual/ack.xml b/manual/en/ack.xml
similarity index 100%
rename from manual/ack.xml
rename to manual/en/ack.xml
diff --git a/manual/addrbook.xml b/manual/en/addrbook.xml
similarity index 100%
rename from manual/addrbook.xml
rename to manual/en/addrbook.xml
diff --git a/manual/advanced.xml b/manual/en/advanced.xml
similarity index 100%
rename from manual/advanced.xml
rename to manual/en/advanced.xml
diff --git a/manual/claws-mail-manual.xml b/manual/en/claws-mail-manual.xml
similarity index 97%
rename from manual/claws-mail-manual.xml
rename to manual/en/claws-mail-manual.xml
index 431dbbf85..52d2d5f9b 100644
--- a/manual/claws-mail-manual.xml
+++ b/manual/en/claws-mail-manual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article SYSTEM "dtd/sdocbook.dtd" [
+<!DOCTYPE article SYSTEM "../dtd/sdocbook.dtd" [
   <!ENTITY ch_intro    SYSTEM "intro.xml">
   <!ENTITY ch_starting SYSTEM "starting.xml">
   <!ENTITY ch_handling SYSTEM "handling.xml">
diff --git a/manual/faq.xml b/manual/en/faq.xml
similarity index 100%
rename from manual/faq.xml
rename to manual/en/faq.xml
diff --git a/manual/glossary.xml b/manual/en/glossary.xml
similarity index 100%
rename from manual/glossary.xml
rename to manual/en/glossary.xml
diff --git a/manual/gpl.xml b/manual/en/gpl.xml
similarity index 100%
rename from manual/gpl.xml
rename to manual/en/gpl.xml
diff --git a/manual/handling.xml b/manual/en/handling.xml
similarity index 100%
rename from manual/handling.xml
rename to manual/en/handling.xml
diff --git a/manual/intro.xml b/manual/en/intro.xml
similarity index 100%
rename from manual/intro.xml
rename to manual/en/intro.xml
diff --git a/manual/keyboard.xml b/manual/en/keyboard.xml
similarity index 100%
rename from manual/keyboard.xml
rename to manual/en/keyboard.xml
diff --git a/manual/plugins.xml b/manual/en/plugins.xml
similarity index 100%
rename from manual/plugins.xml
rename to manual/en/plugins.xml
diff --git a/manual/starting.xml b/manual/en/starting.xml
similarity index 100%
rename from manual/starting.xml
rename to manual/en/starting.xml
diff --git a/manual/es/Makefile.am b/manual/es/Makefile.am
deleted file mode 100644
index 1a605a69a..000000000
--- a/manual/es/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if BUILD_MANUAL
-SUBDIRS=dist
-endif
-
-EXTRA_DIST = \
-	account.xml \
-	ack.xml \
-	addrbook.xml \
-	advanced.xml \
-	faq.xml \
-	glossary.xml \
-	gpl.xml \
-	handling.xml \
-	intro.xml \
-	keyboard.xml \
-	plugins.xml \
-	starting.xml \
-	claws-mail-manual.xml
-
-.PHONY: test
diff --git a/manual/es/dist/Makefile.am b/manual/es/dist/Makefile.am
deleted file mode 100644
index c19a2fde7..000000000
--- a/manual/es/dist/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-SUBDIRS=html pdf ps txt
-
-.PHONY: test
diff --git a/manual/es/dist/html/Makefile.am b/manual/es/dist/html/Makefile.am
deleted file mode 100644
index fdb5e548a..000000000
--- a/manual/es/dist/html/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_HTML
-EXTRA_DIST=claws-mail-manual.html
-manualde_DATA=claws-mail-manual.html
-manualdedir=$(manualdir)/es
-
-claws-mail-manual.html: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
-		$(srcdir)/../../claws-mail-manual.xml
-	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
-	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
-	
-maintainer-clean:
-	-rm claws-mail-manual.html
-	-rm claws-mail-manual.html.raw
-endif
-
-.PHONY: test
diff --git a/manual/es/dist/pdf/Makefile.am b/manual/es/dist/pdf/Makefile.am
deleted file mode 100644
index 10be1b3ec..000000000
--- a/manual/es/dist/pdf/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PDF
-EXTRA_DIST=claws-mail-manual.pdf
-manualde_DATA=claws-mail-manual.pdf
-manualdedir=$(manualdir)/es
-
-claws-mail-manual.pdf: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
-endif
-
-.PHONY: test
diff --git a/manual/es/dist/ps/Makefile.am b/manual/es/dist/ps/Makefile.am
deleted file mode 100644
index debcc978a..000000000
--- a/manual/es/dist/ps/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PS
-EXTRA_DIST=claws-mail-manual.ps
-manualde_DATA=claws-mail-manual.ps
-manualdedir=$(manualdir)/es
-
-claws-mail-manual.ps: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.ps
-endif
-
-.PHONY: test
diff --git a/manual/es/dist/txt/Makefile.am b/manual/es/dist/txt/Makefile.am
deleted file mode 100644
index c0853ad7d..000000000
--- a/manual/es/dist/txt/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_TXT
-EXTRA_DIST=claws-mail-manual.txt
-manualde_DATA=claws-mail-manual.txt
-manualdedir=$(manualdir)/es
-
-claws-mail-manual.txt: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2TXT) -o . $(srcdir)/../../claws-mail-manual.xml
-	
-maintainer-clean:
-	-rm claws-mail-manual.txt
-endif
-
-.PHONY: test
diff --git a/manual/fr/Makefile.am b/manual/fr/Makefile.am
deleted file mode 100644
index 1a605a69a..000000000
--- a/manual/fr/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if BUILD_MANUAL
-SUBDIRS=dist
-endif
-
-EXTRA_DIST = \
-	account.xml \
-	ack.xml \
-	addrbook.xml \
-	advanced.xml \
-	faq.xml \
-	glossary.xml \
-	gpl.xml \
-	handling.xml \
-	intro.xml \
-	keyboard.xml \
-	plugins.xml \
-	starting.xml \
-	claws-mail-manual.xml
-
-.PHONY: test
diff --git a/manual/fr/dist/Makefile.am b/manual/fr/dist/Makefile.am
deleted file mode 100644
index c19a2fde7..000000000
--- a/manual/fr/dist/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-SUBDIRS=html pdf ps txt
-
-.PHONY: test
diff --git a/manual/fr/dist/html/Makefile.am b/manual/fr/dist/html/Makefile.am
deleted file mode 100644
index 109c19b30..000000000
--- a/manual/fr/dist/html/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_HTML
-EXTRA_DIST=claws-mail-manual.html
-manualde_DATA=claws-mail-manual.html
-manualdedir=$(manualdir)/fr
-
-claws-mail-manual.html: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
-		$(srcdir)/../../claws-mail-manual.xml
-	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
-	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
-	
-maintainer-clean:
-	-rm claws-mail-manual.html
-	-rm claws-mail-manual.html.raw
-endif
-
-.PHONY: test
diff --git a/manual/fr/dist/pdf/Makefile.am b/manual/fr/dist/pdf/Makefile.am
deleted file mode 100644
index 100d79b8d..000000000
--- a/manual/fr/dist/pdf/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PDF
-EXTRA_DIST=claws-mail-manual.pdf
-manualde_DATA=claws-mail-manual.pdf
-manualdedir=$(manualdir)/fr
-
-claws-mail-manual.pdf: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
-endif
-
-.PHONY: test
diff --git a/manual/fr/dist/ps/Makefile.am b/manual/fr/dist/ps/Makefile.am
deleted file mode 100644
index 4e43045e8..000000000
--- a/manual/fr/dist/ps/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PS
-EXTRA_DIST=claws-mail-manual.ps
-manualde_DATA=claws-mail-manual.ps
-manualdedir=$(manualdir)/fr
-
-claws-mail-manual.ps: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.ps
-endif
-
-.PHONY: test
diff --git a/manual/fr/dist/txt/Makefile.am b/manual/fr/dist/txt/Makefile.am
deleted file mode 100644
index 34b6a0e42..000000000
--- a/manual/fr/dist/txt/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_TXT
-EXTRA_DIST=claws-mail-manual.txt
-manualde_DATA=claws-mail-manual.txt
-manualdedir=$(manualdir)/fr
-
-claws-mail-manual.txt: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2TXT) -o . $(srcdir)/../../claws-mail-manual.xml
-	
-maintainer-clean:
-	-rm claws-mail-manual.txt
-endif
-
-.PHONY: test
diff --git a/manual/pl/Makefile.am b/manual/pl/Makefile.am
deleted file mode 100644
index 1a605a69a..000000000
--- a/manual/pl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if BUILD_MANUAL
-SUBDIRS=dist
-endif
-
-EXTRA_DIST = \
-	account.xml \
-	ack.xml \
-	addrbook.xml \
-	advanced.xml \
-	faq.xml \
-	glossary.xml \
-	gpl.xml \
-	handling.xml \
-	intro.xml \
-	keyboard.xml \
-	plugins.xml \
-	starting.xml \
-	claws-mail-manual.xml
-
-.PHONY: test
diff --git a/manual/pl/dist/Makefile.am b/manual/pl/dist/Makefile.am
deleted file mode 100644
index c19a2fde7..000000000
--- a/manual/pl/dist/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-SUBDIRS=html pdf ps txt
-
-.PHONY: test
diff --git a/manual/pl/dist/html/Makefile.am b/manual/pl/dist/html/Makefile.am
deleted file mode 100644
index bf965ad6f..000000000
--- a/manual/pl/dist/html/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_HTML
-EXTRA_DIST=claws-mail-manual.html
-manualde_DATA=claws-mail-manual.html
-manualdedir=$(manualdir)/pl
-
-claws-mail-manual.html: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-SP_ENCODING=xml $(DOCBOOK2HTML) -u -o . \
-		$(srcdir)/../../claws-mail-manual.xml
-	-mv -f claws-mail-manual.html claws-mail-manual.html.raw
-	-$(SED) 's,^><META,><META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><META,' < claws-mail-manual.html.raw > claws-mail-manual.html
-	
-maintainer-clean:
-	-rm claws-mail-manual.html
-	-rm claws-mail-manual.html.raw
-endif
-
-.PHONY: test
diff --git a/manual/pl/dist/pdf/Makefile.am b/manual/pl/dist/pdf/Makefile.am
deleted file mode 100644
index c469da32b..000000000
--- a/manual/pl/dist/pdf/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PDF
-EXTRA_DIST=claws-mail-manual.pdf
-manualde_DATA=claws-mail-manual.pdf
-manualdedir=$(manualdir)/pl
-
-claws-mail-manual.pdf: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PDF) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
-endif
-
-.PHONY: test
diff --git a/manual/pl/dist/ps/Makefile.am b/manual/pl/dist/ps/Makefile.am
deleted file mode 100644
index 266644ff5..000000000
--- a/manual/pl/dist/ps/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_PS
-EXTRA_DIST=claws-mail-manual.ps
-manualde_DATA=claws-mail-manual.ps
-manualdedir=$(manualdir)/pl
-
-claws-mail-manual.ps: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2PS) -o . "$(srcdir)/../../claws-mail-manual.xml"
-	
-maintainer-clean:
-	-rm claws-mail-manual.ps
-endif
-
-.PHONY: test
diff --git a/manual/pl/dist/txt/Makefile.am b/manual/pl/dist/txt/Makefile.am
deleted file mode 100644
index cbf266d70..000000000
--- a/manual/pl/dist/txt/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-if MANUAL_TXT
-EXTRA_DIST=claws-mail-manual.txt
-manualde_DATA=claws-mail-manual.txt
-manualdedir=$(manualdir)/pl
-
-claws-mail-manual.txt: \
-	../../account.xml \
-	../../ack.xml \
-	../../addrbook.xml \
-	../../advanced.xml \
-	../../faq.xml \
-	../../glossary.xml \
-	../../gpl.xml \
-	../../handling.xml \
-	../../intro.xml \
-	../../keyboard.xml \
-	../../plugins.xml \
-	../../starting.xml \
-	../../claws-mail-manual.xml 
-	-$(DOCBOOK2TXT) -o . $(srcdir)/../../claws-mail-manual.xml
-	
-maintainer-clean:
-	-rm claws-mail-manual.txt
-endif
-
-.PHONY: test

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list