Bug#118908: make TAGS does not work without having run configure

[Neal H Walfield]

Small glitch (plus this patch applies a lot easier).  Sorry about
that.


2001-11-15  Neal H Walfield  <neal@cs.uml.edu>
    
        * Makeconf (TAGS) [configured]: Create tags for MiG generated
        files.
        * Makefile (TAGS): Generate dependencies respecting broken
        code markers, i.e. based on $(working-prog-subdirs) and not
        $(prog-subdirs).


Index: Makeconf
===================================================================
RCS file: /cvsroot/hurd/hurd/Makeconf,v
retrieving revision 1.194
diff -u -r1.194 Makeconf
--- Makeconf    2001/11/14 23:58:22     1.194
+++ Makeconf    2001/11/15 21:22:12
@@ -379,19 +379,30 @@
 
 # TAGS files
 ifneq ($(dir),.)
-ifeq ($(SRCS),)
-TAGS: $(OTHERTAGS)
-ifeq ($(OTHERTAGS),)
+ifdef configured
+ifneq ($(OBJS:.o=.d),)
+DEP_SRCS = sed -e 's/^.*://' -e 's/ \\$$//' | tr ' ' '\012'| \
+           sed -n -e 's@^$(srcdir)@&@p' -e 's@^[^/]@&@p' | sort -ur
+TAGSFILES=$(OBJS:.o=.d) $(OTHERTAGS)
+else
+TAGSFILES=$(OTHERTAGS)
+endif
+else
+TAGSFILES=$(SRCS) $(OTHERTAGS)
+endif
+
+TAGS: $(TAGSFILES)
+ifeq ($(strip($(TAGSFILES))),)
 # no tags, but parent will include this file, so make empty one.
        > $@
 else
-       etags -o $@ $^
-endif
+ifdef DEP_SRCS
+       cat $(OBJS:.o=.d) | $(DEP_SRCS) | etags -o $@ - $(OTHERTAGS)
 else
-TAGS: $(SRCS) $(OTHERTAGS)
        etags -o $@ $^
 endif
 endif
+endif
 
 # Cleaning
 ifeq ($(clean),yes)
Index: Makefile
===================================================================
RCS file: /cvsroot/hurd/hurd/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- Makefile    2001/02/11 00:23:04     1.119
+++ Makefile    2001/11/15 21:27:18
@@ -94,7 +102,7 @@
                $(working-prog-subdirs)\
                $(other-subdirs))
 
-TAGS: $(addsuffix -TAGS,$(prog-subdirs) $(lib-subdirs))
+TAGS: $(addsuffix -TAGS,$(working-prog-subdirs) $(lib-subdirs))
        etags -o $@ $(patsubst %-TAGS,-i %/TAGS,$^)
 
 ## Targets used by the main targets above.