* Makefile.am (SUBDIRS): Add LANGDATA.

(pkgdata_DATA): Remove ${LANGNAME}
(MISC_TABLE): Remove LANGUAGE.tbl.
(LANGNAME): Delete this variable.
(LANGUAGE.tbl, LANGNAME.en, LANGNAME.fr): Delete these targets.

* LANGDATA/Makefile.am (pkgdata_DATA): Delete ${TABLES}.
(EXTRA_DIST): Remove this variable.
(dist_pkgdata_DATA): New variable.
(dist_noinst_SCRIPTS): New variable.
(native.ext): Don't use native.sh.
(CLEANFILES): New variable.

diff --git a/Makefile.am b/Makefile.am
index 59958b0..0dc8d6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,12 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-SUBDIRS = po icons FLT MIM
+SUBDIRS = po icons FLT MIM LANGDATA
 
 pkgdata_DATA = \
        ${CHARSETS} \
        ${CHAR_TABLE} \
        ${MISC_TABLE} \
-       ${LANGNAME} \
        mdb.dir
 
 EXTRA_DIST = config.rpath mkinstalldirs m4/ChangeLog \
@@ -88,7 +87,7 @@ MISC_TABLE = \
        default.fst xfont.fst truetype.fst generic.fst \
        FONTENC.tbl FONTSIZE.tbl \
        CHARSET.tbl CODING.tbl \
-       LANGUAGE.tbl SCRIPT.tbl SCRIPT-OTF.tbl SCRIPT-LANGUAGE.tbl
+       SCRIPT.tbl SCRIPT-OTF.tbl SCRIPT-LANGUAGE.tbl
 
 UNIDATA = \
        UNIDATA/README \
@@ -103,10 +102,6 @@ FORMATS = \
        FORMATS/Dir.txt FORMATS/FontEncoding.txt FORMATS/Fontset.txt \
        FORMATS/FLT.txt FORMATS/FontSize.txt FORMATS/IM.txt
 
-LANGNAME = \
-       LANGNAME.en \
-       LANGNAME.fr
-
 # Rules for charsets
 
 CHARMAPS = @CHARMAPS@
@@ -288,17 +283,6 @@ BLOCK.tab:
        echo "# Generated from $<." > $@
        @$(AWK) -f CHARTAB.awk FIELD=$@ $< >>$@
 
-LANGUAGE.tbl: LANGUAGE.awk LANGDATA/ISO-639-2.txt LANGDATA/native.txt
-       @$(AWK) -f LANGUAGE.awk '-F|' < LANGDATA/ISO-639-2.txt > $@
-
-LANGNAME.en: LANGNAME.awk LANGDATA/ISO-639-2.txt
-       @echo "Generating $@..."
-       @$(AWK) -f LANGNAME.awk -v LANG=en '-F|' < LANGDATA/ISO-639-2.txt > $@
-
-LANGNAME.fr: LANGNAME.awk LANGDATA/ISO-639-2.txt
-       @echo "Generating $@..."
-       @$(AWK) -f LANGNAME.awk -v LANG=fr '-F|' < LANGDATA/ISO-639-2.txt > $@
-
 pkgdatadir=$(datadir)/m17n
 
 bin_SCRIPTS = m17n-db