Move support for building tags database from Makefile.rules to Makefile, because

it's only used in the top-level directory.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10960 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index 8467283c07b864d2e842f5b965e3396bb31243a7..f574193388acce0a65a7323af4d5deac1d3b8888 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,7 @@ configure: autoconf/configure.ac autoconf/aclocal.m4
 include/Config/config.h.in: autoconf/configure.ac autoconf/aclocal.m4
        autoheader -I autoconf autoconf/configure.ac
 
-# Install support for llvm include files.
-
+# Install support for llvm include files:
 .PHONY: install-includes
 
 install-includes:
@@ -41,3 +40,13 @@ install-includes:
 
 install:: install-includes
 
+# Build tags database for Emacs/Xemacs:
+.PHONY: tags
+
+TAGS: tags
+
+all:: tags
+
+tags:
+       $(ETAGS) $(ETAGSFLAGS) `find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h'`
+

diff --git a/Makefile.rules b/Makefile.rules
index 325cf09496353fff286b1db867da094f5b580d1a..7da6f5737ae67f71fca51a9b7038796efda8db76 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -607,23 +607,6 @@ install-single-object-library: $(LIBNAME_OBJCUR)
 
 endif
 
-#------------------------------------------------------------------------
-# Create a TAGS database for emacs
-#------------------------------------------------------------------------
-
-ifneq ($(ETAGS),false)
-ifeq ($(LEVEL), .)
-SRCDIRS := $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools)
-
-tags:
-       $(ETAGS) -l c++ `find $(SRCDIRS) -name '*.cpp' -o -name '*.h'`
-all:: tags
-endif
-else
-tags:
-       ${ECHO} "Cannot build $@: The program etags is not installed"
-endif
-
 #------------------------------------------------------------------------
 # Handle the TOOLNAME option - used when building tool executables...
 #------------------------------------------------------------------------