[PATCH] target: Fix tcm_mod_builder.py default EXTRA_CFLAGS

[PATCH] target: Fix tcm_mod_builder.py default EXTRA_CFLAGS

[Nicholas A. Bellinger]

From: Nicholas Bellinger <nab@linux-iscsi.org>

This patch removes the unnecessary default EXTRA_CFLAGS include paths
for newly generated fabric modules, which now only contains:

	include/
	drivers/target/$NEW_FABRIC_MOD

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
---
 Documentation/target/tcm_mod_builder.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index bb0038c..cf857c0 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -980,7 +980,7 @@ def tcm_mod_build_kbuild(fabric_mod_dir_var, fabric_mod_name):
 	if not p:
 		tcm_mod_err("Unable to open file: " + f)
 
-	buf = "EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"
+	buf = "EXTRA_CFLAGS += -I$(srctree)/include/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"
 	buf += fabric_mod_name + "-objs			:= " + fabric_mod_name + "_fabric.o \\\n"
 	buf += "					   " + fabric_mod_name + "_configfs.o\n"
 	buf += "obj-$(CONFIG_" + fabric_mod_name.upper() + ")		+= " + fabric_mod_name + ".o\n"
-- 
1.7.3.5

Re: [PATCH] target: Fix tcm_mod_builder.py default EXTRA_CFLAGS

[Christoph Hellwig]

On Tue, Jan 18, 2011 at 01:30:22PM -0800, Nicholas A. Bellinger wrote:
> +	buf = "EXTRA_CFLAGS += -I$(srctree)/include/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"

-I$(srctree)/include/ is never needed, that's added automatically.
Similarly adding the directory of the driver itself (assuming that's
what the second one is supposed to be) is not needed either.

Re: [PATCH] target: Fix tcm_mod_builder.py default EXTRA_CFLAGS

[Nicholas A. Bellinger]

On Tue, 2011-01-18 at 22:36 +0100, Christoph Hellwig wrote:
> On Tue, Jan 18, 2011 at 01:30:22PM -0800, Nicholas A. Bellinger wrote:
> > +	buf = "EXTRA_CFLAGS += -I$(srctree)/include/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"
> 
> -I$(srctree)/include/ is never needed, that's added automatically.
> Similarly adding the directory of the driver itself (assuming that's
> what the second one is supposed to be) is not needed either.
> 

This is correct on the -I$(srctree)/include/, and I will drop this as
well..  However with the current fabric module include layout (all .h
living in drivers/target/$FABRIC_MOD), the latter bit is still required
AFAICS to build.

--nab

Re: [PATCH] target: Fix tcm_mod_builder.py default EXTRA_CFLAGS

[Christoph Hellwig]

On Tue, Jan 18, 2011 at 01:46:02PM -0800, Nicholas A. Bellinger wrote:
> This is correct on the -I$(srctree)/include/, and I will drop this as
> well..  However with the current fabric module include layout (all .h
> living in drivers/target/$FABRIC_MOD), the latter bit is still required
> AFAICS to build.

No, there's no need.  Just use ""-style includes and they'll always get
picked up in the local directory.

Re: [PATCH] target: Fix tcm_mod_builder.py default EXTRA_CFLAGS

[Nicholas A. Bellinger]

On Tue, 2011-01-18 at 22:47 +0100, Christoph Hellwig wrote:
> On Tue, Jan 18, 2011 at 01:46:02PM -0800, Nicholas A. Bellinger wrote:
> > This is correct on the -I$(srctree)/include/, and I will drop this as
> > well..  However with the current fabric module include layout (all .h
> > living in drivers/target/$FABRIC_MOD), the latter bit is still required
> > AFAICS to build.
> 
> No, there's no need.  Just use ""-style includes and they'll always get
> picked up in the local directory.
> 

Whooops, fixed with ""-style includes in commit 7514aea.  Please let me
know if you have any other thoughts wrt tcm_mod_builder.py and I will
get these coded up..

Thanks again,  ;)

--nab