[BZ #493]

[glibc.git] / MakeTAGS

diff --git a/MakeTAGS b/MakeTAGS
index 8bc587a02cdc9b64f544c304f27ff3ed783fa937..1ffdd64000fad19e20aba0f08e9fe1590d90a238 100644 (file)
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -1,22 +1,22 @@
 # Make the TAGS files.
-
-# Copyright (C) 1992, 1994, 1995, 1996, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1992,1994,1995,1996,1998,2002,2003,2005
+#      Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 
 # The GNU C Library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# Lesser General Public License for more details.
 
-# You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
 
 # Make this the default goal.
 TAGS:
@@ -27,6 +27,9 @@ endif
 
 include $(..)Makeconfig
 
+# Pass these to $(MAKE) calls to avoid source generation and such.
+sub-make-vars = generating=t no_deps=t
+
 ifndef tags_sources
 ifeq ($(subdir),ctype)
 # In most cases, we want the C source files to come before
@@ -39,14 +42,15 @@ tags_sources = $(all-sources) $(all-headers) $(all-dist)
 endif  # ctype
 endif  # No tags_sources
 
-sysdep-dirs := $(full-config-sysdirs)
+sysdep-dirs := $(full_config_sysdirs)
 
 ifndef sysdep_dirs
 # Find all sysdep directories.
 sysdep_dirs := $(shell find $(..)sysdeps \
                            $(wildcard \
                                $(patsubst %,$(..)%/sysdeps,$(add-ons))) \
-                           -type d ! -name RCS ! -name CVS -print)
+                           -type d ! -name RCS ! -name CVS \
+                           ! -name SCCS -print)
 endif
 
 # Find all sysdep dirs there are, but putting the ones
@@ -62,10 +66,11 @@ all-dirs := $(subdir-dirs) \
 ifndef subdir
 subdirs := $(subdirs) \
           $(filter-out $(subdirs),\
-                       $(shell sed -e 's/\#.*$$//' \
-                                   $(wildcard $(addsuffix /Subdirs,\
-                                                          $(all-dirs)))\
-                                   /dev/null))
+                       $(sort \
+                         $(shell sed -e 's/\#.*$$//' \
+                                     $(wildcard $(addsuffix /Subdirs,\
+                                                            $(all-dirs)))\
+                                     /dev/null)))
 all-dist = $(foreach Dist,$(wildcard $(all-dirs:%=%/Dist)),\
                     $(addprefix $(Dist:%/Dist=%)/,\
                                 $(filter %.c %.h %.S %.s,\
@@ -88,7 +93,8 @@ sources += $(foreach lib,$(extra-libs),$($(lib)-routines:=.c))
 # sysdep directories, so don't bother searching them.
 sysdep-sources := $(filter-out $(wildcard $(sources)), $(sources))
 all-sources = $(wildcard $(sort $(sources) $(sources:.c=.S) $(sources:.c=.s)  \
-                               $(others:=.c) $(tests:=.c) $(test-srcs:=.c))) \
+                               $(others:=.c) $(tests:=.c) $(xtests:=.c) \
+                               $(test-srcs:=.c))) \
              $(foreach dir,$(all-dirs),\
                        $(wildcard \
                           $(addprefix $(dir)/,\
@@ -121,7 +127,7 @@ TAGS: subdir_TAGS
 .PHONY: subdir_TAGS $(subdirs:%=%/TAGS)
 subdir_TAGS: $(subdirs:%=%/TAGS)
 $(subdirs:%=%/TAGS):
-       $(MAKE) -C $(@D) no_deps=t $(@F)
+       $(MAKE) -C $(@D) $(sub-make-vars) $(@F)
 
 endif # subdir
 \f
@@ -139,13 +145,15 @@ endif
 
 define extract
 @rm -f $@.new
-$(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS  --sort-output \
-           --omit-header -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new $^
+$(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS  --sort-by-file \
+           --omit-header -E -n -d -  --flag=error:3:c-format \
+           $(XGETTEXTFLAGS-$(@F)) > $@.new \
+           $(filter-out tst-%,$(filter-out $(objpfx)distinfo,$^)) /dev/null
 mv -f $@.new $@
 endef
 
-text-srcs := $(filter %.c %.h %.cc %.C,$(tags_sources))
-$P/$(domain).pot: $(text-srcs)
+text-srcs := $(filter %.c %.h %.cc %.C %.bash.in,$(tags_sources))
+$P/$(domain).pot: $(objpfx)distinfo $(text-srcs)
 ifeq (,$(text-srcs))
        cp /dev/null $@
 else
@@ -163,9 +171,6 @@ $P/subdirs.pot: $(subdirs:%=$P/%.pot)
         do sed "/^#:/s% % $$d/%g" $P/$$d.pot; done) > $@.new
        mv -f $@.new $@
 
-# Get $(version) defined.
-include $(common-objpfx)version.mk
-
 # Combine all the messages into the final sorted template translation file.
 # The following code requires GNU date.
 $P/libc.pot: $(all-pot)
@@ -174,11 +179,13 @@ $P/libc.pot: $(all-pot)
        sed -e 's/VERSION/$(version)/' \
            -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
            po/header.pot > $@.new
-       $(XGETTEXT) -d - --omit-header -n -s $^ >> $@.new
+       $(XGETTEXT) -d - --omit-header -E -n $^ >> $@.new
        mv -f $@.new $@
+ifeq ($(with-cvs),yes)
        test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
+endif
 
 $(subdirs:%=$P/%.pot): $P/%.pot: FORCE
-       $(MAKE) -C $* no_deps=t ../$@
+       $(MAKE) -C $* $(sub-make-vars) ../$@
 FORCE:
 endif