* [PATCH] Allow `make O=<obj> {cscope,tags}` to work
@ 2004-07-19 17:17 George G. Davis
2004-07-19 19:24 ` sam
0 siblings, 1 reply; 5+ messages in thread
From: George G. Davis @ 2004-07-19 17:17 UTC (permalink / raw)
To: linux-kernel
Greetings,
Here's a trivial fix to allow `make O=<obj> {cscope,tags}` to work:
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/07/19 12:49:14-04:00 gdavis@davisg.ne.client2.attbi.com
# Makefile:
# Allow `make O=<obj> {cscope,tags}` to work
#
# Makefile
# 2004/07/19 12:28:02-04:00 gdavis@davisg.ne.client2.attbi.com +9 -9
# Allow `make O=<obj> {cscope,tags}` to work
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2004-07-19 13:00:49 -04:00
+++ b/Makefile 2004-07-19 13:00:49 -04:00
@@ -1009,26 +1009,26 @@
# ---------------------------------------------------------------------------
define all-sources
- ( find . $(RCS_FIND_IGNORE) \
+ ( find $(srctree) $(RCS_FIND_IGNORE) \
\( -name include -o -name arch \) -prune -o \
-name '*.[chS]' -print; \
- find arch/$(ARCH) $(RCS_FIND_IGNORE) \
+ find $(srctree)/arch/$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
- find security/selinux/include $(RCS_FIND_IGNORE) \
+ find $(srctree)/security/selinux/include $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
- find include $(RCS_FIND_IGNORE) \
+ find $(srctree)/include $(RCS_FIND_IGNORE) \
\( -name config -o -name 'asm-*' \) -prune \
-o -name '*.[chS]' -print; \
- find include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
+ find $(srctree)/include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
- find include/asm-generic $(RCS_FIND_IGNORE) \
+ find $(srctree)/include/asm-generic $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print )
endef
-quiet_cmd_cscope-file = FILELST cscope.files
- cmd_cscope-file = $(all-sources) > cscope.files
+quiet_cmd_cscope-file = FILELST $(obj)/cscope.files
+ cmd_cscope-file = $(all-sources) > $(obj)/cscope.files
-quiet_cmd_cscope = MAKE cscope.out
+quiet_cmd_cscope = MAKE $(obj)/cscope.out
cmd_cscope = cscope -k -b -q
cscope: FORCE
--
Regards,
George
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Allow `make O=<obj> {cscope,tags}` to work
2004-07-19 17:17 [PATCH] Allow `make O=<obj> {cscope,tags}` to work George G. Davis
@ 2004-07-19 19:24 ` sam
2004-07-19 17:36 ` George G. Davis
0 siblings, 1 reply; 5+ messages in thread
From: sam @ 2004-07-19 19:24 UTC (permalink / raw)
To: George G. Davis; +Cc: linux-kernel
On Mon, Jul 19, 2004 at 01:17:59PM -0400, George G. Davis wrote:
> Greetings,
>
> Here's a trivial fix to allow `make O=<obj> {cscope,tags}` to work:
>
>
> # This is a BitKeeper generated diff -Nru style patch.
> #
> # ChangeSet
> # 2004/07/19 12:49:14-04:00 gdavis@davisg.ne.client2.attbi.com
> # Makefile:
> # Allow `make O=<obj> {cscope,tags}` to work
> #
> # Makefile
> # 2004/07/19 12:28:02-04:00 gdavis@davisg.ne.client2.attbi.com +9 -9
> # Allow `make O=<obj> {cscope,tags}` to work
> #
> diff -Nru a/Makefile b/Makefile
> --- a/Makefile 2004-07-19 13:00:49 -04:00
> +++ b/Makefile 2004-07-19 13:00:49 -04:00
> @@ -1009,26 +1009,26 @@
> # ---------------------------------------------------------------------------
>
> define all-sources
> - ( find . $(RCS_FIND_IGNORE) \
> + ( find $(srctree) $(RCS_FIND_IGNORE) \
> \( -name include -o -name arch \) -prune -o \
> -name '*.[chS]' -print; \
> - find arch/$(ARCH) $(RCS_FIND_IGNORE) \
> + find $(srctree)/arch/$(ARCH) $(RCS_FIND_IGNORE) \
> -name '*.[chS]' -print; \
> - find security/selinux/include $(RCS_FIND_IGNORE) \
> + find $(srctree)/security/selinux/include $(RCS_FIND_IGNORE) \
> -name '*.[chS]' -print; \
> - find include $(RCS_FIND_IGNORE) \
> + find $(srctree)/include $(RCS_FIND_IGNORE) \
> \( -name config -o -name 'asm-*' \) -prune \
> -o -name '*.[chS]' -print; \
> - find include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
> + find $(srctree)/include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
> -name '*.[chS]' -print; \
> - find include/asm-generic $(RCS_FIND_IGNORE) \
> + find $(srctree)/include/asm-generic $(RCS_FIND_IGNORE) \
> -name '*.[chS]' -print )
OK so far.
> endef
>
> -quiet_cmd_cscope-file = FILELST cscope.files
> - cmd_cscope-file = $(all-sources) > cscope.files
> +quiet_cmd_cscope-file = FILELST $(obj)/cscope.files
> + cmd_cscope-file = $(all-sources) > $(obj)/cscope.files
The $(obj) in this line should not be needed. Current directory
defaults to $(obj) equals $(objtree) when executing make cscope.
Sam
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Allow `make O=<obj> {cscope,tags}` to work
2004-07-19 19:24 ` sam
@ 2004-07-19 17:36 ` George G. Davis
2004-07-19 18:29 ` George G. Davis
0 siblings, 1 reply; 5+ messages in thread
From: George G. Davis @ 2004-07-19 17:36 UTC (permalink / raw)
To: linux-kernel
On Mon, Jul 19, 2004 at 09:24:30PM +0200, sam@ravnborg.org wrote:
> On Mon, Jul 19, 2004 at 01:17:59PM -0400, George G. Davis wrote:
<snip>
> > endef
> >
> > -quiet_cmd_cscope-file = FILELST cscope.files
> > - cmd_cscope-file = $(all-sources) > cscope.files
> > +quiet_cmd_cscope-file = FILELST $(obj)/cscope.files
> > + cmd_cscope-file = $(all-sources) > $(obj)/cscope.files
> The $(obj) in this line should not be needed. Current directory
> defaults to $(obj) equals $(objtree) when executing make cscope.
Yep, I got carried away there, Thanks. Should I resubmit a revised patch?
TIA!
--
Regards,
George
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Allow `make O=<obj> {cscope,tags}` to work
2004-07-19 17:36 ` George G. Davis
@ 2004-07-19 18:29 ` George G. Davis
2004-07-22 22:45 ` Sam Ravnborg
0 siblings, 1 reply; 5+ messages in thread
From: George G. Davis @ 2004-07-19 18:29 UTC (permalink / raw)
To: linux-kernel
On Mon, Jul 19, 2004 at 01:36:54PM -0400, George G. Davis wrote:
> On Mon, Jul 19, 2004 at 09:24:30PM +0200, sam@ravnborg.org wrote:
> > On Mon, Jul 19, 2004 at 01:17:59PM -0400, George G. Davis wrote:
>
> <snip>
>
> > > endef
> > >
> > > -quiet_cmd_cscope-file = FILELST cscope.files
> > > - cmd_cscope-file = $(all-sources) > cscope.files
> > > +quiet_cmd_cscope-file = FILELST $(obj)/cscope.files
> > > + cmd_cscope-file = $(all-sources) > $(obj)/cscope.files
> > The $(obj) in this line should not be needed. Current directory
> > defaults to $(obj) equals $(objtree) when executing make cscope.
>
> Yep, I got carried away there, Thanks. Should I resubmit a revised patch?
Ok, after clutzing about with bk fix, etc., here's the revised patch:
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/07/19 14:24:28-04:00 gdavis@davisg.ne.client2.attbi.com
# Makefile:
# Allow `make O=<obj> {cscope,tags}` to work
#
# Makefile
# 2004/07/19 14:17:25-04:00 gdavis@davisg.ne.client2.attbi.com +6 -6
# Allow `make O=<obj> {cscope,tags}` to work
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2004-07-19 14:24:43 -04:00
+++ b/Makefile 2004-07-19 14:24:43 -04:00
@@ -1009,19 +1009,19 @@
# ---------------------------------------------------------------------------
define all-sources
- ( find . $(RCS_FIND_IGNORE) \
+ ( find $(srctree) $(RCS_FIND_IGNORE) \
\( -name include -o -name arch \) -prune -o \
-name '*.[chS]' -print; \
- find arch/$(ARCH) $(RCS_FIND_IGNORE) \
+ find $(srctree)/arch/$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
- find security/selinux/include $(RCS_FIND_IGNORE) \
+ find $(srctree)/security/selinux/include $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
- find include $(RCS_FIND_IGNORE) \
+ find $(srctree)/include $(RCS_FIND_IGNORE) \
\( -name config -o -name 'asm-*' \) -prune \
-o -name '*.[chS]' -print; \
- find include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
+ find $(srctree)/include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
- find include/asm-generic $(RCS_FIND_IGNORE) \
+ find $(srctree)/include/asm-generic $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print )
endef
--
Regards,
George
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Allow `make O=<obj> {cscope,tags}` to work
2004-07-19 18:29 ` George G. Davis
@ 2004-07-22 22:45 ` Sam Ravnborg
0 siblings, 0 replies; 5+ messages in thread
From: Sam Ravnborg @ 2004-07-22 22:45 UTC (permalink / raw)
To: George G. Davis; +Cc: linux-kernel
On Mon, Jul 19, 2004 at 02:29:25PM -0400, George G. Davis wrote:
> On Mon, Jul 19, 2004 at 01:36:54PM -0400, George G. Davis wrote:
> > On Mon, Jul 19, 2004 at 09:24:30PM +0200, sam@ravnborg.org wrote:
> > > On Mon, Jul 19, 2004 at 01:17:59PM -0400, George G. Davis wrote:
> >
> > <snip>
> >
> > > > endef
> > > >
> > > > -quiet_cmd_cscope-file = FILELST cscope.files
> > > > - cmd_cscope-file = $(all-sources) > cscope.files
> > > > +quiet_cmd_cscope-file = FILELST $(obj)/cscope.files
> > > > + cmd_cscope-file = $(all-sources) > $(obj)/cscope.files
> > > The $(obj) in this line should not be needed. Current directory
> > > defaults to $(obj) equals $(objtree) when executing make cscope.
> >
> > Yep, I got carried away there, Thanks. Should I resubmit a revised patch?
>
> Ok, after clutzing about with bk fix, etc., here's the revised patch:
Thanks. Added to my local kbuild tree.
Sam
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-07-22 20:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-19 17:17 [PATCH] Allow `make O=<obj> {cscope,tags}` to work George G. Davis
2004-07-19 19:24 ` sam
2004-07-19 17:36 ` George G. Davis
2004-07-19 18:29 ` George G. Davis
2004-07-22 22:45 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox