From 6ec3f553fe985ad58d64ea49663812e78aed41ef Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Thu, 17 Jul 2003 20:29:40 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 2 +- gcc/po/exgettext | 15 ++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 72dec0501fb..91cbc781dfa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-07-17 Neil Booth + + * 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 * c-decl.c: Fix typos in several comments. Remove all diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 414980ccf0d..56fd154bf86 100644 --- 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 # # Remake cpp and protoize. diff --git a/gcc/po/exgettext b/gcc/po/exgettext index 83e39239dcf..93f65c34370 100644 --- 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, "(") -- 2.30.2