re PR other/20792 (target.opt messages missing from gcc.pot)

gcc/
	PR other/20792
	* Makefile.in (gcc.pot): Remove options.c dependency.
	* optc-gen.awk: Don't quote help strings with N_().

gcc/po/
	PR other/20792
	* exgettext: Don't scan options.c.  Scan .opt files for help strings.
	* gcc.pot: Regenerate.

From-SVN: r97759

gcc/ChangeLog

@@ -1,3 +1,9 @@
+2004-04-06  Richard Sandiford  <rsandifo@redhat.com>
+
+	PR other/20792
+	* Makefile.in (gcc.pot): Remove options.c dependency.
+	* optc-gen.awk: Don't quote help strings with N_().
+
 2005-04-06  James A. Morrison  <phython@gcc.gnu.org>
 
 	* c-common.c (handle_malloc_atttribute): Only set DECL_IS_MALLOC if

gcc/Makefile.in

@@ -4285,7 +4285,7 @@ install-po:
 # fairly modern (POSIX-compliant) awk.
 # The .pot file is left in the build directory.
 gcc.pot: po/gcc.pot
-po/gcc.pot: force options.c
+po/gcc.pot: force
 	-test -d po || mkdir po
 	$(MAKE) srcextra
 	AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \

gcc/optc-gen.awk

@@ -126,7 +126,7 @@ for (i = 0; i < n_opts; i++)
 		if (help[i] == "")
 			hlp = "0"
 		else
-			hlp = "N_(" quote help[i] quote ")";
+			hlp = quote help[i] quote;
 
 		printf("  { %c-%s%c,\n    %s,\n    %s, %u, %s, %s, %s }%s\n",
 			quote, opts[i], quote, hlp, back_chain[i], len,

gcc/po/ChangeLog

@@ -1,3 +1,9 @@
+2004-04-06  Richard Sandiford  <rsandifo@redhat.com>
+
+	PR other/20792
+	* exgettext: Don't scan options.c.  Scan .opt files for help strings.
+	* gcc.pot: Regenerate.
+
 2005-04-06  Joseph S. Myers  <joseph@codesourcery.com>
 
 	* rw.po: New file.

gcc/po/exgettext

@@ -58,9 +58,6 @@ kopt=$pwd/$T/keyword-options
 emsg=$pwd/$T/emsgids.c
 posr=$pwd/$T/po-sources
 
-# Extra files to scan
-extra_files=$pwd/options.c
-
 # Locate files to scan, and generate the list.  All .c, .h, and .def files
 # in $srcdir are examined, likewise $srcdir/config and $srcdir/config/*
 # (directories).  Also, all subdirectories of $srcdir that contain a
@@ -83,7 +80,6 @@ echo "scanning for keywords and %e strings..." >&2
         do  eval echo $dir$glob
         done
     done;
-    echo $extra_files;
   } | tr ' ' "$nl" | grep -v '\*' |
   $AWK -v excl=po/EXCLUDES -v posr=$posr -v kopt=$kopt -v emsg=$emsg '
 function keyword_option(line) {
@@ -161,6 +157,29 @@ END {
 }'
 )
 
+echo "scanning option files..." >&2
+
+( cd $srcdir; find . -name '*.opt' -print |
+  $AWK '{
+    file = $1
+    lineno = 1
+    field = 0
+    while (getline < file) {
+	if (/^[ \t]*(;|$)/ || !/^[^ \t]/) {
+	    field = 0
+	} else {
+	    if (field == 2) {
+		line = $0
+		gsub(".*\t", "", line)
+		printf("#line %d \"%s\"\n", lineno, file)
+		printf("_(\"%s\")\n", line)
+	    }
+	    field++;
+	}
+	lineno++;
+    }
+  }') >> $emsg
+
 # Run the xgettext command, with temporary added as a file to scan.
 echo "running xgettext..." >&2
 $xgettext --default-domain=$package --directory=$srcdir \