Merge branch 'taw/meson' into taw/combined

12 files changed, 12 insertions, 65 deletions

diff --git a/faq/.gitignore b/faq/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/faq/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/faq/Makefile.am b/faq/Makefile.am
deleted file mode 100644
index 82fa2005..00000000
--- a/faq/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = de en es fr it
-
-EXTRA_DIST = GFDL-1.2
diff --git a/faq/de/.gitignore b/faq/de/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/faq/de/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/faq/de/Makefile.am b/faq/de/Makefile.am
deleted file mode 100644
index 74ba3849..00000000
--- a/faq/de/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-faqdatadir = $(faqdir)/de
-
-faqdata_DATA = \
-     sylpheed-faq-1.html \
-     sylpheed-faq-2.html \
-     sylpheed-faq-3.html \
-     sylpheed-faq.html 
-
-# generated by `ls -1 | sed -e 's/\(.*\)/     \1 \'`
-
-EXTRA_DIST = $(faqdata_DATA)
diff --git a/faq/en/.gitignore b/faq/en/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/faq/en/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/faq/en/Makefile.am b/faq/en/Makefile.am
deleted file mode 100644
index eaa74da0..00000000
--- a/faq/en/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-faqdatadir = $(faqdir)/en
-
-faqdata_DATA = \
-     sylpheed-faq-1.html \
-     sylpheed-faq-2.html \
-     sylpheed-faq-3.html \
-     sylpheed-faq-4.html \
-     sylpheed-faq.html 
-
-# generated by `ls -1 | sed -e 's/\(.*\)/     \1 \'`
-
-EXTRA_DIST = $(faqdata_DATA) \
-     faq.xml \
-     faq_001.xml \
-     faq_002.xml \
-     faq_003.xml \
-     fdl.xml \
-     LICENSE
diff --git a/faq/es/.gitignore b/faq/es/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/faq/es/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/faq/es/Makefile.am b/faq/es/Makefile.am
deleted file mode 100644
index a3e82c1d..00000000
--- a/faq/es/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-faqdatadir = $(faqdir)/es
-
-faqdata_DATA = \
-     sylpheed-faq-1.html \
-     sylpheed-faq-2.html \
-     sylpheed-faq-3.html \
-     sylpheed-faq.html 
-
-# generated by `ls -1 | sed -e 's/\(.*\)/     \1 \'`
-
-EXTRA_DIST = $(faqdata_DATA)
diff --git a/faq/fr/.gitignore b/faq/fr/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/faq/fr/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/faq/fr/Makefile.am b/faq/fr/Makefile.am
deleted file mode 100644
index 2b264204..00000000
--- a/faq/fr/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-faqdatadir = $(faqdir)/fr
-
-faqdata_DATA = \
-     sylpheed-faq-1.html \
-     sylpheed-faq-2.html \
-     sylpheed-faq-3.html \
-     sylpheed-faq.html 
-
-# generated by `ls -1 | sed -e 's/\(.*\)/     \1 \'`
-
-EXTRA_DIST = $(faqdata_DATA)
diff --git a/faq/it/.gitignore b/faq/it/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/faq/it/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/faq/it/Makefile.am b/faq/it/Makefile.am
deleted file mode 100644
index 619228de..00000000
--- a/faq/it/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-faqdatadir = $(faqdir)/it
-
-faqdata_DATA = \
-     sylpheed-faq-1.html \
-     sylpheed-faq-2.html \
-     sylpheed-faq-3.html \
-     sylpheed-faq.html 
-
-# generated by `ls -1 | sed -e 's/\(.*\)/     \1 \'`
-
-EXTRA_DIST = $(faqdata_DATA)