Re: [PATCH] Allow `make O=<obj> {cscope,tags}` to work

From: George G. Davis
Date: Mon Jul 19 2004 - 13:32:09 EST


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@xxxxxxxxxxxx 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@xxxxxxxxxxxxxxxxxxxxxxxxxxx
# Makefile:
# Allow `make O=<obj> {cscope,tags}` to work
#
# Makefile
# 2004/07/19 14:17:25-04:00 gdavis@xxxxxxxxxxxxxxxxxxxxxxxxxxx +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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/