summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Hegbloom <hegbloom@pdx.edu>2005-06-19 00:50:47 -0700
committerSam Ravnborg <sam@mars.(none)>2005-07-13 21:45:57 +0000
commitacbef459a663a8349ceb46b5a11ede50fa7909c7 (patch)
tree793c0d842fc8bafb180c298042e3227e30375ccd
parentd2cb1a95c5fa4d1691c90a4f530955b4ea3cfa24 (diff)
[PATCH] kbuild: make 'cscope -q' play well with cscope.el
I tried the Linux Makefile 'make cscope' target, and found that the generated database is not compatible with 'cscope.el' under XEmacs. The thing is that 'cscope.el' does not allow setting the command line options to the 'cscope' commands it runs, and it errors with a message about the options not matching the ones used to generate the index. It turns out the cscope designers already thought of this. The options can be written into the "cscope.files". The included patch moves the "-q" and "-k" options from the 'cmd_cscope' to the 'cmd_cscope-file', echoing them into the top of the files listing. Now the index is generated with the "-q" option, and when 'cscope.el' performs it's search, it uses that argument as well. Lookups are fast and everyone is happy. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9cf07e7b9f88..8294cd73b3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1177,10 +1177,10 @@ define all-sources
endef
quiet_cmd_cscope-file = FILELST cscope.files
- cmd_cscope-file = $(all-sources) > cscope.files
+ cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
quiet_cmd_cscope = MAKE cscope.out
- cmd_cscope = cscope -k -b -q
+ cmd_cscope = cscope -b
cscope: FORCE
$(call cmd,cscope-file)