Makefile.in: Depend .pot generation on options.c.

	* Makefile.in: Depend .pot generation on options.c.
	* po/exgettext: Add an extra_files variable containing additional
	files to scan.

From-SVN: r69524

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 72dec05..91cbc78 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-17  Neil Booth  <neil@daikokuya.co.uk>
+
+       * Makefile.in: Depend .pot generation on options.c.
+       * po/exgettext: Add an extra_files variable containing additional
+       files to scan.
+
 2003-07-17  Zack Weinberg  <zack@codesourcery.com>
 
        * c-decl.c: Fix typos in several comments.  Remove all

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 414980c..56fd154 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2332,7 +2332,7 @@ intl.o: intl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h Makefile
 
 # Make-lang.in should add dependencies of po-generated on any generated
 # files which need to be scanned by gettext (usually Yacc-generated parsers).
-po-generated: $(parsedir)/c-parse.c
+po-generated: $(parsedir)/c-parse.c options.c
 
 #\f
 # Remake cpp and protoize.

diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index 83e3923..93f65c3 100644 (file)
--- a/gcc/po/exgettext
+++ b/gcc/po/exgettext
@@ -58,6 +58,9 @@ 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
@@ -75,11 +78,13 @@ echo "scanning for keywords and %e strings..." >&2
 
 ( cd $srcdir
   lang_subdirs=`echo */config-lang.in | sed -e 's|config-lang\.in||g'`
-  for dir in "" config/ config/*/ $lang_subdirs
-  do  for glob in '*.c' '*.h' '*.def'
-      do  eval echo $dir$glob
-      done
-  done | tr ' ' "$nl" | grep -v '\*' |
+  { for dir in "" config/ config/*/ $lang_subdirs
+    do  for glob in '*.c' '*.h' '*.def'
+        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) {
     paren_index = index(line, "(")