[dasher] Makefiles: - don't use * to glob in rules - $< is not defined in explicit rules

[Patrick Welche <pwelche src gnome org>]

commit 09fa535702b8daca618133a9dfa75d5f18b6be6d
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Fri Jan 14 07:56:08 2011 +0000

    Makefiles:
    - don't use * to glob in rules
    - $< is not defined in explicit rules

 Data/alphabets/Makefile.am |  140 ++++++++++++++++++++++++++++++++++++++++++-
 Data/colours/Makefile.am   |   14 ++++-
 Data/training/Makefile.am  |   40 ++++++++++++-
 Doc/user/Makefile.am       |    4 +-
 4 files changed, 186 insertions(+), 12 deletions(-)
---
diff --git a/Data/alphabets/Makefile.am b/Data/alphabets/Makefile.am
index 95ad0c4..9531288 100644
--- a/Data/alphabets/Makefile.am
+++ b/Data/alphabets/Makefile.am
@@ -1,4 +1,136 @@
-pkgdata_DATA = alphabet.dtd alphabet.xsl  $(srcdir)/alphabet*.xml
-
-EXTRA_DIST = alphabet.dtd alphabet.xsl  $(srcdir)/alphabet*.xml
-
+dist_pkgdata_DATA = alphabet.dtd alphabet.xsl	\
+	alphabet.AfaanOromo.xml		\
+	alphabet.Armenian.xml		\
+	alphabet.Assamese.xml		\
+	alphabet.Austen.xml		\
+	alphabet.Azerbaijani.xml	\
+	alphabet.Belarusian.xml		\
+	alphabet.Bulgarian.xml		\
+	alphabet.Esperanto.xml		\
+	alphabet.Estonian.xml		\
+	alphabet.Filipino.xml		\
+	alphabet.Greek.xml		\
+	alphabet.Gujarati.xml		\
+	alphabet.Hawaiian.xml		\
+	alphabet.Hebrew.xml		\
+	alphabet.Hindi.xml		\
+	alphabet.Icelandic.xml		\
+	alphabet.Igbo.xml		\
+	alphabet.Indonesian.xml		\
+	alphabet.IrishGaelic.xml	\
+	alphabet.Kannada.xml		\
+	alphabet.Katakana.xml		\
+	alphabet.Malay.xml		\
+	alphabet.Malayalam.xml		\
+	alphabet.Marathi.xml		\
+	alphabet.Moldavian.xml		\
+	alphabet.Ndebele.xml		\
+	alphabet.Oriya.xml		\
+	alphabet.Punjabi.xml		\
+	alphabet.Romanian.xml		\
+	alphabet.Sami.xml		\
+	alphabet.ScotsGaelic.xml	\
+	alphabet.Sepedi.xml		\
+	alphabet.Sesotho.xml		\
+	alphabet.Sinhala.xml		\
+	alphabet.Slovak.xml		\
+	alphabet.Slovenian.xml		\
+	alphabet.Swati.xml		\
+	alphabet.Tajik.xml		\
+	alphabet.Tamil.xml		\
+	alphabet.Telugu.xml		\
+	alphabet.Thai.xml		\
+	alphabet.Thai2.xml		\
+	alphabet.Tsonga.xml		\
+	alphabet.Tswana.xml		\
+	alphabet.Turkish.xml		\
+	alphabet.Urdu.xml		\
+	alphabet.Vietnamese.xml		\
+	alphabet.Xhosa.xml		\
+	alphabet.Yoruba.xml		\
+	alphabet.Zulu.xml		\
+	alphabet.abc.xml		\
+	alphabet.adangbe.xml		\
+	alphabet.afrikaans.xml		\
+	alphabet.akan.xml		\
+	alphabet.albanian.xml		\
+	alphabet.amharic.xml		\
+	alphabet.arabic.xml		\
+	alphabet.basque.xml		\
+	alphabet.bengali.xml		\
+	alphabet.bopomofo.xml		\
+	alphabet.bosnian.xml		\
+	alphabet.breton.xml		\
+	alphabet.catalan.xml		\
+	alphabet.cherokee.xml		\
+	alphabet.chinese.xml		\
+	alphabet.chineseRuby.xml	\
+	alphabet.corsican.xml		\
+	alphabet.croatian.xml		\
+	alphabet.czech.xml		\
+	alphabet.danish.xml		\
+	alphabet.dutch.xml		\
+	alphabet.english.xml		\
+	alphabet.englishC.xml		\
+	alphabet.ethiopic.xml		\
+	alphabet.ewe.xml		\
+	alphabet.faroese.xml		\
+	alphabet.finnish.xml		\
+	alphabet.finnish2.xml		\
+	alphabet.french.xml		\
+	alphabet.ga.xml			\
+	alphabet.galician.xml		\
+	alphabet.georgian.xml		\
+	alphabet.german.xml		\
+	alphabet.hausa.xml		\
+	alphabet.hiragana.xml		\
+	alphabet.hiragana2.xml		\
+	alphabet.hungarian.xml		\
+	alphabet.ipa.xml		\
+	alphabet.italian.xml		\
+	alphabet.japanese.canna.xml	\
+	alphabet.kazakh.xml		\
+	alphabet.kirghiz.xml		\
+	alphabet.kirundi.xml		\
+	alphabet.klingon.xml		\
+	alphabet.korean.xml		\
+	alphabet.koreanNested.xml	\
+	alphabet.kurdish.xml		\
+	alphabet.lao.xml		\
+	alphabet.latex.xml		\
+	alphabet.latin.xml		\
+	alphabet.latvian.xml		\
+	alphabet.lithuanian.xml		\
+	alphabet.luxembourgish.xml	\
+	alphabet.macedonian.xml		\
+	alphabet.maltese.xml		\
+	alphabet.mongolian.xml		\
+	alphabet.myanmar.xml		\
+	alphabet.nepali.xml		\
+	alphabet.norwegian.xml		\
+	alphabet.occitan.xml		\
+	alphabet.ogham.xml		\
+	alphabet.pashto.xml		\
+	alphabet.perl.xml		\
+	alphabet.persian.xml		\
+	alphabet.pinyin.xml		\
+	alphabet.pinyin2.xml		\
+	alphabet.polish.xml		\
+	alphabet.portuguese.xml		\
+	alphabet.romansch.xml		\
+	alphabet.runic.xml		\
+	alphabet.russian.xml		\
+	alphabet.sanskrit.xml		\
+	alphabet.serbian.xml		\
+	alphabet.somali.xml		\
+	alphabet.spanish.xml		\
+	alphabet.spyDict.xml		\
+	alphabet.swahili.xml		\
+	alphabet.swedish.xml		\
+	alphabet.thaana.xml		\
+	alphabet.tigrinya.xml		\
+	alphabet.turkmen.xml		\
+	alphabet.ukrainian.xml		\
+	alphabet.uzbek.xml		\
+	alphabet.venda.xml		\
+	alphabet.welsh.xml
diff --git a/Data/colours/Makefile.am b/Data/colours/Makefile.am
index d11cb5b..4999b45 100644
--- a/Data/colours/Makefile.am
+++ b/Data/colours/Makefile.am
@@ -1,3 +1,11 @@
-pkgdata_DATA = colour.dtd  $(srcdir)/colour*.xml
-
-EXTRA_DIST = colour.dtd  $(srcdir)/colour*.xml
+dist_pkgdata_DATA = colour.dtd	\
+	colour.blue.xml		\
+	colour.euroasian.xml	\
+	colour.euroasian2.xml	\
+	colour.euroasian3.xml	\
+	colour.jamie.xml	\
+	colour.rainbow.xml	\
+	colour.thai.xml		\
+	colour.vowels.xml	\
+	colour.vowels2.xml	\
+	colour.xml
diff --git a/Data/training/Makefile.am b/Data/training/Makefile.am
index de2cb14..c62c325 100644
--- a/Data/training/Makefile.am
+++ b/Data/training/Makefile.am
@@ -1,3 +1,39 @@
-pkgdata_DATA = $(srcdir)/training*.txt
+dist_pkgdata_DATA =			\
+	training_albanian_SQ.txt	\
+	training_basque_ES.txt		\
+	training_bengali_BD.txt		\
+	training_canna_JP.txt		\
+	training_czechC_CS.txt		\
+	training_czech_CS.txt		\
+	training_danish_DK.txt		\
+	training_dutch_NL.txt		\
+	training_englishLC_GB.txt	\
+	training_english_GB.txt		\
+	training_finnish_FI.txt		\
+	training_frenchC_FR.txt		\
+	training_french_FR.txt		\
+	training_german_DE.txt		\
+	training_greek_GR.txt		\
+	training_hebrew_IL.txt		\
+	training_hiragana60_JP.txt	\
+	training_hiragana83_JP.txt	\
+	training_hungarian_HU.txt	\
+	training_italianC_IT.txt	\
+	training_italian_IT.txt		\
+	training_mongolian_MN.txt	\
+	training_persian_IR.txt		\
+	training_polish_PL.txt		\
+	training_portugueseC_BR.txt	\
+	training_portuguese_BR.txt	\
+	training_russian_RU.txt		\
+	training_spanishC_ES.txt	\
+	training_spanish_ES.txt		\
+	training_spyDict.txt		\
+	training_swahili_KE.txt		\
+	training_swedish_SE.txt		\
+	training_turkish_TR.txt		\
+	training_welsh_GB.txt
 
-EXTRA_DIST = $(srcdir)/training*.txt $(srcdir)/*.COPYING
+EXTRA_DIST = 				\
+	training_czech_CS.COPYING	\
+	training_welsh_GB.COPYING
diff --git a/Doc/user/Makefile.am b/Doc/user/Makefile.am
index 97d5779..02e7dfe 100644
--- a/Doc/user/Makefile.am
+++ b/Doc/user/Makefile.am
@@ -4,6 +4,4 @@ EXTRA_DIST = dasher.1.in
 DISTCLEANFILES=dasher.1
 
 dasher.1: $(srcdir)/dasher.1.in
-	sed -e s/PACKAGE_VERSION/$(PACKAGE_VERSION)/ -e s:DOCDIR:$(docdir): <$< >$@
-
-
+	sed -e s/PACKAGE_VERSION/$(PACKAGE_VERSION)/ -e s:DOCDIR:$(docdir): < $> > $@