build: Remove po-gram-gen2.h.

* gettext-tools/src/po-lex.c: Include po-gram-gen.h instead of po-gram-gen2.h.
* gettext-tools/src/po-lex.h: Update comment.
* gettext-tools/src/Makefile.am (noinst_HEADERS): Remove po-gram-gen2.h.
(po-gram-gen2.h): Remove rule.
(BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Don't add it.
(po-lex.o, po-lex.lo): Don't depend on it.

diff --git a/.gitignore b/.gitignore
index 3c3544448082ca3e67edd6e32e64e7bfc9194877..c93368ece2cf6abfd2fe99dd2ada2e11feee44a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -543,7 +543,6 @@
 /gettext-tools/src/cldr-plural.h
 /gettext-tools/src/po-gram-gen.c
 /gettext-tools/src/po-gram-gen.h
-/gettext-tools/src/po-gram-gen2.h
 # Files generated by "make", using msgfmt.
 /gettext-runtime/po/??.gmo
 /gettext-runtime/po/ast.gmo

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index c6d6763ba35b141e9d3e76e1e905a3dab7d2714f..ba7f045afbd1949db9ec1741658903e545a5edf2 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -41,7 +41,7 @@ noinst_HEADERS = \
   read-catalog-file.h read-po.h read-properties.h read-stringtable.h \
   str-list.h \
   write-catalog.h write-po.h write-properties.h write-stringtable.h \
-  dir-list.h file-list.h po-gram-gen.h po-gram-gen2.h cldr-plural.h \
+  dir-list.h file-list.h po-gram-gen.h cldr-plural.h \
   cldr-plural-exp.h locating-rule.h its.h search-path.h \
   msgl-charset.h msgl-equal.h msgl-iconv.h msgl-ascii.h msgl-ofn.h msgl-cat.h \
   msgl-header.h msgl-english.h msgl-check.h msgl-fsearch.h msgfmt.h msgunfmt.h \
@@ -595,20 +595,6 @@ MAINTAINERCLEANFILES += po-gram-gen.c po-gram-gen.h
 EXTRA_DIST += po-gram-gen.c po-gram-gen.h
 
 
-# po-gram-gen2.h is generated from po-gram-gen.h and is also distributed in the
-# tarballs (just for convenience).
-po-gram-gen2.h: po-gram-gen.h
-       $(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' \
-              -e 's|"po-gram-gen\.h"|"po-gram-gen2.h"|' \
-              < $(srcdir)/po-gram-gen.h > po-gram-gen2.h-tmp \
-       && mv po-gram-gen2.h-tmp $(srcdir)/po-gram-gen2.h
-BUILT_SOURCES += po-gram-gen2.h
-MOSTLYCLEANFILES += po-gram-gen2.h-tmp
-MAINTAINERCLEANFILES += po-gram-gen2.h
-EXTRA_DIST += po-gram-gen2.h
-
-po-lex.o po-lex.lo: po-gram-gen2.h
-
 cldr-plural.c cldr-plural.h: cldr-plural.y
        $(AM_V_YACC)$(BISON) -d $(YFLAGS) $(AM_YFLAGS) $(srcdir)/cldr-plural.y \
        && test ':' = '$(BISON)' || { \

diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index 7be0845d3182769798ad71bb00ca5d609469d69f..0b389a19c8b4b181b314a5522945635666e52b13 100644 (file)
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -49,7 +49,7 @@
 #include "pos.h"
 #include "message.h"
 #include "str-list.h"
-#include "po-gram-gen2.h"
+#include "po-gram-gen.h"
 
 #define _(str) gettext(str)
 

diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h
index 7204a406253d43c6f19f4d959410f157be87e8f6..db9e86a3a98a7fc482ef54b56a0fbfbf576f62c2 100644 (file)
--- a/gettext-tools/src/po-lex.h
+++ b/gettext-tools/src/po-lex.h
@@ -74,7 +74,7 @@ extern void lex_start (FILE *fp, const char *real_filename,
 extern void lex_end (void);
 
 /* Return the next token in the PO file.  The return codes are defined
-   in "po-gram-gen2.h".  Associated data is put in '*lval'.  */
+   in "po-gram-gen.h".  Associated data is put in '*lval'.  */
 union PO_GRAM_STYPE;
 extern int po_gram_lex (union PO_GRAM_STYPE *lval);