X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=a152e28e0bc04e5c28e7c80365a1b8c974ac388a;hb=9458fa215af0294e9c38d62cc3a237a85fe50509;hp=603ffa13757e31ae139a60ebd6fc31e47d92b770;hpb=74d1cd49cf0bfdd9f78cd7f4d7ac763b11ac541b;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 603ffa1375..a152e28e0b 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -48,22 +48,22 @@ webdir = $(local_package_docdir)
 help: generic-help local-help
 	@echo -e "\
   all         update everything\n\
-  clean       remove all genated stuff in $(outdir)\n\
-  check       run selftest\n\
+  clean       remove all generated stuff in $(outdir)\n\
+  check       run self tests\n\
   default     same as the empty target\n\
   exe         update all executables\n\
   help        this help\n\
   install     install programs and data (prefix=$(prefix))\n\
   lib         update all libraries\n\
-  web         update website in out-www\n\
+  web         update website in directory \`out-www'\n\
   web-install install website documentation in (webdir=$(webdir))\n\
-  web-clean   clean out-www\n\
-  TAGS        genarate tagfiles\n\
+  web-clean   clean \`out-www' directory\n\
+  TAGS        generate tagfiles\n\
 \n\
-Make may be invoked from any subdirectory\n\
-Note that all commands recurse into SUBDIRS;\n\
-prepend \`local-' to do only cwd, eg: local-clean\n\
-"\
+\`make' may be invoked from any subdirectory.\n\
+Note that all commands recurse into subdirectories;\n\
+prepend \`local-' to restrict operation to the current directory.\n\
+Example: \`local-clean'.\n"
 
 local-help:
 
@@ -88,17 +88,22 @@ local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
 html: $(HTML_FILES)
 
 TAGS:
-	-if [ "$(TAGS_FILES)" != "" ]; then \
-		etags $(ETAGS_FLAGS) $(TAGS_FILES) || \
-		ctags $(CTAGS_FLAGS) ".h.hh.tcc.icc" $(TAGS_FILES) $(ERROR_LOG); \
-	fi
-
 	$(LOOP)
+	$(MAKE) local-tags
+
+DEEPER_TAGS_FILES = $(shell find $(pwd) -mindepth 2 -name 'TAGS')
+local-tags:
+	-if [ -n "$(TAGS_HEADERS)$(TAGS_SOURCES)$(DEEPER_TAGS_FILES)" ]; then \
+		etags $(ETAGS_FLAGS) $(DEEPER_TAGS_FILES:%=--include=%) \
+			$(TAGS_SOURCES) $(TAGS_HEADERS) $(ERROR_LOG) ; \
+		ctags $(CTAGS_FLAGS) $(TAGS_SOURCES) $(TAGS_HEADERS) \
+			$(ERROR_LOG) ; \
+	fi
 
 $(outdir)/version.hh: $(depth)/VERSION $(config_make)
 	$(PYTHON) $(step-bindir)/make-version.py $< > $@
 
-$(outdir)/config.h: $(config_h)
+$(outdir)/config.hh: $(config_h)
 	cp -p $< $@
 
 configure: configure.in aclocal.m4
@@ -134,13 +139,14 @@ installextradoc:
 	$(foreach i, $(EXTRA_DOC_FILES),\
 		cp -r $(i) $(prefix)/doc/$(package) &&) true
 
-include $(outdir)/dummy.dep $(DEP_FILES) # expect a warning here
+
+include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 
 $(outdir)/dummy.dep:
+	@echo please ignore innocent warning about dummy.dep
 	-mkdir -p $(outdir)
 	touch $(outdir)/dummy.dep
 
-
 check: local-check
 	$(LOOP)