remove references to po2tbl

2002-01-31  jacob berkman  <jacob@ximian.com>

	* glib-gettextize.in:
	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
	references to po2tbl

12 files changed, 53 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c1c0bc768..72a23ce0d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* glib-gettextize.in:
+	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
+	references to po2tbl
+
 2002-01-29  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gmarkup.c (g_markup_parse_context_parse): Change the
diff --git a/glib-gettextize.in b/glib-gettextize.in
index 21bf0cbc1..e205c563f 100644
--- a/glib-gettextize.in
+++ b/glib-gettextize.in
@@ -104,12 +104,6 @@ po/Makefile.in.in exists: use option -f if you really want to delete it."
   exit 1
 fi
 
-if test -f po/po2tbl.sed.in && test $force -eq 0; then
-  $echo "\
-po/po2tbl.sed.in exists: use option -f if you really want to delete it."
-  exit 1
-fi
-
 test -d po || {
   $echo "Creating po/ subdirectory"
   mkdir po || {
diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 71571821d..d81c8c83e 100644
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -192,9 +192,6 @@ strdup __argz_count __argz_stringify __argz_next])
      dnl cannot handle comments.
      sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed
    fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/po/po2tbl.sed.in > po/po2tbl.sed
 
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
    dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
diff --git a/po/ChangeLog b/po/ChangeLog
index 3ca893b6b..76d0cc526 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-31  jacob berkman  <jacob@ximian.com>
+
+	* Makefile.in.in: remove references to po2tbl.sed.in
+
 2002-01-31  Roy-Magne Mo  <rmo@sunnmore.net>
 
 	* nn.po: Update Norwegian (nynorsk) translation.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index be4bfa2a2..b9f1a8232 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -97,21 +97,6 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
 	   || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
 		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
 
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ./po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
-		| sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
@@ -166,8 +151,6 @@ install-data-yes: all
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	  $(INSTALL_DATA) $(srcdir)/po2tbl.sed.in \
-			  $(DESTDIR)$(gettextsrcdir)/po2tbl.sed.in; \
 	else \
 	  : ; \
 	fi
@@ -200,7 +183,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m po2tbl.sed
+	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"