Add a cscope target to the Makefile

5 files changed, 47 insertions, 208 deletions

diff --git a/.gitignore b/.gitignore
index b70c9e21..961fba32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *#
 .#*
 autom4te.*
+cscope.files
 cscope*out
 config.h
 config.log
diff --git a/Makefile.am b/Makefile.am
index 4eb1335b..a7b7b4ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,10 @@ dist-gitversion: git_version.stamp
 git_version.h:
 	$(srcdir)/git_version.sh -k --srcdir $(srcdir) -o git_version.h
 
+.PHONY: cscope
+cscope:
+	git ls-files '*.cxx' '*.c' '*.h' | grep -v '^testsuite' > cscope.files
+	cscope -b -q
 
 
 stap_CXXFLAGS = $(AM_CXXFLAGS)
diff --git a/Makefile.in b/Makefile.in
index b5496252..1582acbc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -235,7 +235,6 @@ builddir = @builddir@
 cap_LIBS = @cap_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
-dejazilla = @dejazilla@
 docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
@@ -1152,8 +1151,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -1178,8 +1177,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1189,13 +1188,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -1268,6 +1266,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -1295,6 +1297,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -1464,7 +1468,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 	clean-binPROGRAMS clean-generic clean-local \
 	clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \
 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
@@ -1507,6 +1511,11 @@ dist-gitversion: git_version.stamp
 
 git_version.h:
 	$(srcdir)/git_version.sh -k --srcdir $(srcdir) -o git_version.h
+
+.PHONY: cscope
+cscope:
+	git ls-files '*.cxx' '*.c' '*.h' | grep -v '^testsuite' > cscope.files
+	cscope -b -q
 @BUILD_ELFUTILS_TRUE@stamp-elfutils: config.status
 @BUILD_ELFUTILS_TRUE@	$(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all
 @BUILD_ELFUTILS_TRUE@	for dir in libelf libebl libdw libdwfl backends; do \
diff --git a/aclocal.m4 b/aclocal.m4
index 9d70920d..0e2027cd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -47,8 +50,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -343,7 +348,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -391,13 +396,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -502,16 +507,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -872,7 +878,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
diff --git a/cscope.files b/cscope.files
deleted file mode 100644
index 92822d8e..00000000
--- a/cscope.files
+++ /dev/null
@@ -1,181 +0,0 @@
--q
-./buildrun.cxx
-./buildrun.h
-./cache.cxx
-./cache.h
-./config.h
-./coveragedb.cxx
-./coveragedb.h
-./elaborate.cxx
-./elaborate.h
-./git_version.h
-./hash.cxx
-./hash.h
-./loc2c.c
-./loc2c.h
-./loc2c-test.c
-./main.cxx
-./mdfour.c
-./mdfour.h
-./parse.cxx
-./parse.h
-./runtime/alloc.c
-./runtime/arith.c
-./runtime/autoconf-constant-tsc.c
-./runtime/autoconf-hrtimer-rel.c
-./runtime/autoconf-inode-private.c
-./runtime/autoconf-ktime-get-real.c
-./runtime/autoconf-module-nsections.c
-./runtime/autoconf-nameidata.c
-./runtime/autoconf-probe-kernel.c
-./runtime/autoconf-tsc-khz.c
-./runtime/autoconf-unregister-kprobes.c
-./runtime/autoconf-x86-uniregs.c
-./runtime/bench2/itest.c
-./runtime/copy.c
-./runtime/counter.c
-./runtime/debug.h
-./runtime/docs/examples/argv.c
-./runtime/docs/examples/foreach.c
-./runtime/docs/examples/list.c
-./runtime/docs/examples/map.c
-./runtime/docs/examples/template.c
-./runtime/io.c
-./runtime/loc2c-runtime.h
-./runtime/map.c
-./runtime/map-gen.c
-./runtime/map.h
-./runtime/map-stat.c
-./runtime/mempool.c
-./runtime/perf.c
-./runtime/perf.h
-./runtime/pmap-gen.c
-./runtime/print.c
-./runtime/print_new.c
-./runtime/print_old.c
-./runtime/probes/agg/count1.c
-./runtime/probes/agg/count2.c
-./runtime/probes/agg/stat1.c
-./runtime/probes/bench/bench.c
-./runtime/probes/bench/bench_io1.c
-./runtime/probes/bench/bench_io2.c
-./runtime/probes/bench/bench_io3.c
-./runtime/probes/bench/bench_io4.c
-./runtime/probes/bench/bench_multi.c
-./runtime/probes/bench/bench_ret.c
-./runtime/probes/bench/itest.c
-./runtime/probes/bench/ttest.c
-./runtime/probes.c
-./runtime/probes/os_timer/os_timer.c
-./runtime/probes/scf/scf.c
-./runtime/probes/shellsnoop/shellsnoop.c
-./runtime/probes/tasklet/stp_tasklet.c
-./runtime/probes/test4/test4.c
-./runtime/probes/where_func/kprobe_where_funct.c
-./runtime/procfs.c
-./runtime/regs.c
-./runtime/regs.h
-./runtime/regs-ia64.c
-./runtime/runtime.h
-./runtime/stack-arm.c
-./runtime/stack.c
-./runtime/stack-i386.c
-./runtime/stack-ia64.c
-./runtime/stack-ppc64.c
-./runtime/stack-s390.c
-./runtime/stack-x86_64.c
-./runtime/staprun/cap.c
-./runtime/staprun/common.c
-./runtime/staprun/ctl.c
-./runtime/staprun/mainloop.c
-./runtime/staprun/relay.c
-./runtime/staprun/relay_old.c
-./runtime/staprun/stapio.c
-./runtime/staprun/stap_merge.c
-./runtime/staprun/staprun.c
-./runtime/staprun/staprun_funcs.c
-./runtime/staprun/staprun.h
-./runtime/staprun/unwind_data.c
-./runtime/stat.c
-./runtime/stat-common.c
-./runtime/stat.h
-./runtime/string.c
-./runtime/string.h
-./runtime/sym.c
-./runtime/sym.h
-./runtime/task_finder.c
-./runtime/tests/agg/count.c
-./runtime/tests/agg/stats.c
-./runtime/tests/maps/ii.c
-./runtime/tests/maps/iiiiii.c
-./runtime/tests/maps/iiss.c
-./runtime/tests/maps/is.c
-./runtime/tests/maps/issii.c
-./runtime/tests/maps/isx.c
-./runtime/tests/maps/map_format.c
-./runtime/tests/maps/setadd.c
-./runtime/tests/maps/si.c
-./runtime/tests/maps/size.c
-./runtime/tests/maps/sort2.c
-./runtime/tests/maps/sort.c
-./runtime/tests/maps/sort_stat.c
-./runtime/tests/maps/ssssss.c
-./runtime/tests/math/div64.c
-./runtime/tests/pmaps/ii2.c
-./runtime/tests/pmaps/ii3.c
-./runtime/tests/pmaps/ii.c
-./runtime/tests/pmaps/is.c
-./runtime/tests/pmaps/ix2.c
-./runtime/tests/pmaps/ix.c
-./runtime/tests/pmaps/ix_log.c
-./runtime/tests/pmaps/ix_none.c
-./runtime/tests/pmaps/map_format.c
-./runtime/tests/pmaps/si.c
-./runtime/tests/pmaps/size.c
-./runtime/tests/string/print_cstr.c
-./runtime/tests/string/printf_A.c
-./runtime/tests/string/printf_B.c
-./runtime/tests/string/string1.c
-./runtime/tests/string/string2.c
-./runtime/tests/string/string3.c
-./runtime/time.c
-./runtime/transport/control.c
-./runtime/transport/procfs.c
-./runtime/transport/relayfs.c
-./runtime/transport/relayfs.h
-./runtime/transport/symbols.c
-./runtime/transport/transport.c
-./runtime/transport/transport.h
-./runtime/transport/transport_msgs.h
-./runtime/transport/utt.c
-./runtime/transport/utt.h
-./runtime/unwind.c
-./runtime/unwind/i386.h
-./runtime/unwind/unwind.h
-./runtime/unwind/x86_64.h
-./runtime/uprobes/uprobes_arch.c
-./runtime/uprobes/uprobes_arch.h
-./runtime/uprobes/uprobes.c
-./runtime/uprobes/uprobes.h
-./runtime/uprobes/uprobes_i386.c
-./runtime/uprobes/uprobes_i386.h
-./runtime/uprobes/uprobes_ppc64.c
-./runtime/uprobes/uprobes_ppc64.h
-./runtime/uprobes/uprobes_s390.c
-./runtime/uprobes/uprobes_s390.h
-./runtime/uprobes/uprobes_x86_64.c
-./runtime/uprobes/uprobes_x86_64.h
-./runtime/uprobes/uprobes_x86.c
-./runtime/uprobes/uprobes_x86.h
-./runtime/vsprintf.c
-./session.h
-./staplog.c
-./staptree.cxx
-./staptree.h
-./tapsets.cxx
-./tapsets.h
-./tapset/test/master.c
-./translate.cxx
-./translate.h
-./util.cxx
-./util.h