about summary refs log tree commit diff
path: root/MakeTAGS
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-29 16:05:21 +0000
committerRoland McGrath <roland@gnu.org>1996-01-29 16:05:21 +0000
commit19c3f20809aa8eed924084b45c5390674cfdbbbc (patch)
tree5429913d454c3472a95240de3d5102744a9b2eb5 /MakeTAGS
parentdc825f85f4795fc45f67eb27708d9adcc72c9b40 (diff)
downloadglibc-19c3f20809aa8eed924084b45c5390674cfdbbbc.tar.gz
glibc-19c3f20809aa8eed924084b45c5390674cfdbbbc.tar.xz
glibc-19c3f20809aa8eed924084b45c5390674cfdbbbc.zip
Thu Jan 25 21:10:39 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
	* db/Makefile (subdir-dirs): Renamed from dbdirs.

	* Makerules (distinfo-vars): Add subdir-dirs.

	* MakeTAGS: Remove vpath directives.
	(all-dirs): Prepend $(subdir-dirs).
	(all-sources, all-headers): Use wildcard to find sources.
Thu Jan 25 21:10:39 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* db/Makefile (subdir-dirs): Renamed from dbdirs.

	* Makerules (distinfo-vars): Add subdir-dirs.

	* MakeTAGS: Remove vpath directives.
	(all-dirs): Prepend $(subdir-dirs).
	(all-sources, all-headers): Use wildcard to find sources.

Mon Jan 29 10:44:38 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* malloc/Makefile (CFLAGS-vm-limit.c, CFLAGS-ralloc.c): New
	variables.

	* mach/msgserver.c: Declare DEMUX arg with prototype.
Diffstat (limited to 'MakeTAGS')
-rw-r--r--MakeTAGS28
1 files changed, 13 insertions, 15 deletions
diff --git a/MakeTAGS b/MakeTAGS
index 186d5192e4..a442ce8d1e 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -49,16 +49,12 @@ endif
 
 # Find all sysdep dirs there are, but putting the ones
 # we are configured to use first and preserving their order.
-all-dirs := $(objdir) \
+all-dirs := $(subdir-dirs) \
+	    $(objdir) \
 	    $(sysdep-dirs) \
 	    $(source_dirs) \
 	    $(filter-out $(sysdep-dirs),$(sysdep_dirs))
 
-vpath %.h $(all-dirs)
-vpath %.c $(all-dirs)
-vpath %.S $(all-dirs)
-vpath %.s $(all-dirs)
-
 # Find all the subdirs there are, but putting the ones
 # we are configured to use first and preserving their order.
 ifndef subdir
@@ -83,15 +79,17 @@ all-dist := $(filter-out %.h %.c %.s %.S,$(all-dist))
 
 # All different versions of $(sources), preserving the configured sysdep
 # directory order.
-all-sources = $(shell find . $(all-dirs) -maxdepth 1 \( -name fnord \
-			   $(foreach file,$(sort $(sources) $(sources:.c=.S) \
-						 $(sources:.c=.s)),\
-				     -o -name $(file)) \
-			   \) -print)
-
-all-headers = $(shell find . $(all-dirs) -maxdepth 1 \( -name fnord \
-			   $(foreach file,$(headers),-o -name $(file)) \
-			   \) -print)
+all-sources = $(wildcard $(sort $(sources) $(sources:.c=.S) \
+				$(sources:.c=.s))) \
+	      $(foreach dir,$(all-dirs),\
+			$(wildcard \
+			   $(addprefix $(dir)/,\
+				       $(sort $(sources) $(sources:.c=.S) \
+					      $(sources:.c=.s)))))
+
+all-headers = $(wildcard $(headers)) \
+	      $(foreach dir,$(all-dirs),\
+			$(wildcard $(addprefix $(dir)/,$(headers))))
 
 tags_sources := $(strip $(tags_sources))