Update.

[platform/upstream/glibc.git] / MakeTAGS

diff --git a/MakeTAGS b/MakeTAGS
index 7aaf0ac..b4320ee 100644 (file)
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -1,6 +1,6 @@
 # Make the TAGS files.
 
-# Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1994, 1995, 1996, 1998 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
@@ -14,9 +14,9 @@
 # Library 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., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# 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.
 
 # Make this the default goal.
 TAGS:
@@ -39,12 +39,14 @@ tags_sources = $(all-sources) $(all-headers) $(all-dist)
 endif  # ctype
 endif  # No tags_sources
 
-sysdep-dirs := $(addprefix $(sysdep_dir)/,$(sysdirs))
+sysdep-dirs := $(full-config-sysdirs)
 
 ifndef sysdep_dirs
 # Find all sysdep directories.
-sysdep_dirs := $(shell find $(..)sysdeps -type d \
-                                        ! -name RCS ! -name CVS -print)
+sysdep_dirs := $(shell find $(..)sysdeps \
+                           $(wildcard \
+                               $(patsubst %,$(..)%/sysdeps,$(add-ons))) \
+                           -type d ! -name RCS ! -name CVS -print)
 endif
 
 # Find all sysdep dirs there are, but putting the ones
@@ -73,23 +75,31 @@ else
 all-dist = $(distribute)
 endif
 
-sources += $(filter %.c %.s %.S,$(all-dist))
-headers += $(filter %.h,$(all-dist))
+# sources and headers must be simply expanded variables
+sources := $(sources) $(filter %.c %.s %.S,$(all-dist))
+headers := $(headers) $(filter %.h,$(all-dist))
 all-dist := $(filter-out %.h %.c %.s %.S,$(all-dist))
 
+sources += $(foreach lib,$(extra-libs),$($(lib)-routines:=.c))
+
 # All different versions of $(sources), preserving the configured sysdep
 # directory order.
-all-sources = $(wildcard $(sort $(sources) $(sources:.c=.S) \
-                               $(sources:.c=.s))) \
+# Files that are found in the current directory cannot occur in
+# 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))) \
              $(foreach dir,$(all-dirs),\
                        $(wildcard \
                           $(addprefix $(dir)/,\
-                                      $(sort $(sources) $(sources:.c=.S) \
-                                             $(sources:.c=.s)))))
+                                      $(sort $(sysdep-sources) \
+                                             $(sysdep-sources:.c=.S) \
+                                             $(sysdep-sources:.c=.s)))))
 
+sysdep-headers := $(filter-out $(wildcard $(headers)), $(headers))
 all-headers = $(wildcard $(headers)) \
              $(foreach dir,$(all-dirs),\
-                       $(wildcard $(addprefix $(dir)/,$(headers))))
+                       $(wildcard $(addprefix $(dir)/,$(sysdep-headers))))
 
 tags_sources := $(strip $(tags_sources))
 
@@ -129,8 +139,8 @@ endif
 
 define extract
 @rm -f $@.new
-$(XGETTEXT) --keyword=_ --keyword=N_ --sort-output -d - \
-           $(XGETTEXTFLAGS-$(@F)) > $@.new $^
+$(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS  --sort-output \
+           --omit-header -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new $^
 mv -f $@.new $@
 endef
 
@@ -142,16 +152,7 @@ else
        $(extract)
 endif
 
-$P/siglist.pot: $(common-objpfx)siglist.c; $(extract)
-$P/errlist.pot: $(..)sysdeps/mach/hurd/errlist.c; $(extract)
-
-# Extract all strings from these files; their strings are not marked.
-# Their surroundings are also not interesting.
-XGETTEXTFLAGS-siglist.pot = -a --no-location
-XGETTEXTFLAGS-errlist.pot = -a --no-location
-
-all-pot = $P/libc-top.pot $P/subdirs.pot \
-         $P/siglist.pot $P/errlist.pot
+all-pot = $P/libc-top.pot $P/subdirs.pot
 
 ifndef subdir
 # Collect all the subdir messages, massaging the file names in comments
@@ -159,17 +160,22 @@ ifndef subdir
 $P/subdirs.pot: $(subdirs:%=$P/%.pot)
        @rm -f $@.new
        (for d in $(subdirs); \
-        do sed "s%^#: %&$$d/%" $P/$$d.pot; done) > $@.new
+        do sed "/^#:/s% % $$d/%g" $P/$$d.pot; done) > $@.new
        mv -f $@.new $@
 
 # Combine all the messages into the final sorted template translation file.
-$P/SYS_libc.pot: $(all-pot)
+# The following code requires GNU date.
+$P/libc.pot: $(all-pot)
        @rm -f $@.new
-       sed -e 's/VERSION/$(version)/' -e "s/DATE/`date +'%Y-%m-%d %k:%M'`" \
+       set `date -R`; disp="$$6"; \
+       sed -e 's/VERSION/$(version)/' \
+           -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
            po/header.pot > $@.new
-       $(XGETTEXT) -d - -n -s --omit-header $^ >> $@.new
+       $(XGETTEXT) -d - --omit-header -n -s $^ >> $@.new
        mv -f $@.new $@
-       test ! -d CVS || cvs ci -m'Regenerated from source files' $@
+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 ../$@