Update.

[platform/upstream/glibc.git] / MakeTAGS

diff --git a/MakeTAGS b/MakeTAGS
index c6f497e..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
@@ -84,17 +84,22 @@ 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) \
-                               $(others:=.c) $(tests:=.c))) \
+# 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))
 
@@ -158,9 +163,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)
@@ -171,7 +173,9 @@ $P/libc.pot: $(all-pot)
            po/header.pot > $@.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 ../$@