* [PATCH 2/2] target: rename Kbuild files to Makefile
@ 2010-11-15 19:43 Christoph Hellwig
2010-11-15 20:32 ` Nicholas A. Bellinger
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2010-11-15 19:43 UTC (permalink / raw)
To: nab; +Cc: linux-scsi
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: lio-core/drivers/target/Kbuild
===================================================================
--- lio-core.orig/drivers/target/Kbuild 2010-11-15 20:28:49.340253390 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
-
-target_core_mod-y := target_core_configfs.o \
- target_core_device.o \
- target_core_fabric_configfs.o \
- target_core_fabric_lib.o \
- target_core_hba.o \
- target_core_pr.o \
- target_core_alua.o \
- target_core_scdb.o \
- target_core_tmr.o \
- target_core_tpg.o \
- target_core_transport.o \
- target_core_cdb.o \
- target_core_ua.o \
- target_core_rd.o \
- target_core_mib.o
-
-obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
-
-# Subsystem modules
-obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
-obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
-obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
-obj-$(CONFIG_TCM_STGT) += target_core_stgt.o
-
-# Fabric modules
-obj-$(CONFIG_LIO_TARGET) += lio-target/
-obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop/
-
-obj-$(CONFIG_TCM_FC) += tcm_fc/
Index: lio-core/drivers/target/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lio-core/drivers/target/Makefile 2010-11-15 20:32:13.206003355 +0100
@@ -0,0 +1,31 @@
+EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
+
+target_core_mod-y := target_core_configfs.o \
+ target_core_device.o \
+ target_core_fabric_configfs.o \
+ target_core_fabric_lib.o \
+ target_core_hba.o \
+ target_core_pr.o \
+ target_core_alua.o \
+ target_core_scdb.o \
+ target_core_tmr.o \
+ target_core_tpg.o \
+ target_core_transport.o \
+ target_core_cdb.o \
+ target_core_ua.o \
+ target_core_rd.o \
+ target_core_mib.o
+
+obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
+
+# Subsystem modules
+obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
+obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
+obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
+obj-$(CONFIG_TCM_STGT) += target_core_stgt.o
+
+# Fabric modules
+obj-$(CONFIG_LIO_TARGET) += lio-target/
+obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop/
+
+obj-$(CONFIG_TCM_FC) += tcm_fc/
Index: lio-core/drivers/target/tcm_fc/Kbuild
===================================================================
--- lio-core.orig/drivers/target/tcm_fc/Kbuild 2010-11-15 20:32:27.637004333 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/target/ \
- -I$(srctree)/drivers/scsi/ \
- -I$(srctree)/include/scsi/ \
- -I$(srctree)/drivers/target/tcm_fc/
-
-tcm_fc-objs := \
- tfc_cmd.o \
- tfc_conf.o \
- tfc_io.o \
- tfc_sess.o
-
-obj-$(CONFIG_TCM_FC) += tcm_fc.o
-
-ifdef CONFIGFS_TCM_FC_DEBUG
-EXTRA_CFLAGS += -DTCM_FC_DEBUG
-endif
Index: lio-core/drivers/target/tcm_fc/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lio-core/drivers/target/tcm_fc/Makefile 2010-11-15 20:32:55.127016720 +0100
@@ -0,0 +1,15 @@
+EXTRA_CFLAGS += -I$(srctree)/drivers/target/ \
+ -I$(srctree)/drivers/scsi/ \
+ -I$(srctree)/include/scsi/ \
+ -I$(srctree)/drivers/target/tcm_fc/
+
+tcm_fc-y += tfc_cmd.o \
+ tfc_conf.o \
+ tfc_io.o \
+ tfc_sess.o
+
+obj-$(CONFIG_TCM_FC) += tcm_fc.o
+
+ifdef CONFIGFS_TCM_FC_DEBUG
+EXTRA_CFLAGS += -DTCM_FC_DEBUG
+endif
Index: lio-core/drivers/target/tcm_loop/Kbuild
===================================================================
--- lio-core.orig/drivers/target/tcm_loop/Kbuild 2010-11-15 20:33:03.138261841 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/tcm_loop/
-
-tcm_loop-objs := tcm_loop_fabric.o \
- tcm_loop_fabric_scsi.o \
- tcm_loop_configfs.o \
-
-obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop.o
-
-ifdef CONFIG_TCM_LOOP_CDB_DEBUG
-EXTRA_CFLAGS += -DTCM_LOOP_CDB_DEBUG
-endif
Index: lio-core/drivers/target/tcm_loop/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lio-core/drivers/target/tcm_loop/Makefile 2010-11-15 20:33:14.072290333 +0100
@@ -0,0 +1,11 @@
+EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/tcm_loop/
+
+tcm_loop-y := tcm_loop_fabric.o \
+ tcm_loop_fabric_scsi.o \
+ tcm_loop_configfs.o \
+
+obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop.o
+
+ifdef CONFIG_TCM_LOOP_CDB_DEBUG
+EXTRA_CFLAGS += -DTCM_LOOP_CDB_DEBUG
+endif
Index: lio-core/drivers/target/lio-target/Kbuild
===================================================================
--- lio-core.orig/drivers/target/lio-target/Kbuild 2010-11-15 20:33:29.942254717 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/lio-target
-
-EXTRA_CFLAGS+=-D_TARGET -DPYX_ISCSI_VENDOR='"Linux-iSCSI.org"'
-
-iscsi_target_mod-objs := iscsi_auth_chap.o \
- iscsi_debug_opcodes.o \
- iscsi_parameters.o \
- iscsi_seq_and_pdu_list.o \
- iscsi_serial.o \
- iscsi_thread_queue.o \
- iscsi_target_datain_values.o \
- iscsi_target_device.o \
- iscsi_target_discovery.o \
- iscsi_target_erl0.o \
- iscsi_target_erl1.o \
- iscsi_target_erl2.o \
- iscsi_target_login.o \
- iscsi_target_nego.o \
- iscsi_target_nodeattrib.o \
- iscsi_target_tmr.o \
- iscsi_target_tpg.o \
- iscsi_target_util.o \
- iscsi_target.o \
- iscsi_target_configfs.o \
- iscsi_target_mib.o
-
-ifdef CONFIG_LIO_TARGET_DEBUG_ERL
-iscsi_target_mod-objs += iscsi_target_debugerl.o
-EXTRA_CFLAGS += -DDEBUG_ERL
-endif
-
-ifdef CONFIG_LIO_TARGET_DEBUG
-EXTRA_CFLAGS += -DCONFIG_ISCSI_DEBUG=1
-endif
-
-
-obj-$(CONFIG_LIO_TARGET) += iscsi_target_mod.o
Index: lio-core/drivers/target/lio-target/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lio-core/drivers/target/lio-target/Makefile 2010-11-15 20:34:18.928004914 +0100
@@ -0,0 +1,36 @@
+EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/lio-target
+
+EXTRA_CFLAGS+=-D_TARGET -DPYX_ISCSI_VENDOR='"Linux-iSCSI.org"'
+
+iscsi_target_mod-y += iscsi_auth_chap.o \
+ iscsi_debug_opcodes.o \
+ iscsi_parameters.o \
+ iscsi_seq_and_pdu_list.o \
+ iscsi_serial.o \
+ iscsi_thread_queue.o \
+ iscsi_target_datain_values.o \
+ iscsi_target_device.o \
+ iscsi_target_discovery.o \
+ iscsi_target_erl0.o \
+ iscsi_target_erl1.o \
+ iscsi_target_erl2.o \
+ iscsi_target_login.o \
+ iscsi_target_nego.o \
+ iscsi_target_nodeattrib.o \
+ iscsi_target_tmr.o \
+ iscsi_target_tpg.o \
+ iscsi_target_util.o \
+ iscsi_target.o \
+ iscsi_target_configfs.o \
+ iscsi_target_mib.o
+
+ifdef CONFIG_LIO_TARGET_DEBUG_ERL
+iscsi_target_mod-y += iscsi_target_debugerl.o
+EXTRA_CFLAGS += -DDEBUG_ERL
+endif
+
+ifdef CONFIG_LIO_TARGET_DEBUG
+EXTRA_CFLAGS += -DCONFIG_ISCSI_DEBUG=1
+endif
+
+obj-$(CONFIG_LIO_TARGET) += iscsi_target_mod.o
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] target: rename Kbuild files to Makefile
2010-11-15 19:43 [PATCH 2/2] target: rename Kbuild files to Makefile Christoph Hellwig
@ 2010-11-15 20:32 ` Nicholas A. Bellinger
2010-11-15 20:55 ` Nicholas A. Bellinger
0 siblings, 1 reply; 4+ messages in thread
From: Nicholas A. Bellinger @ 2010-11-15 20:32 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-scsi, Boaz Harrosh
On Mon, 2010-11-15 at 14:43 -0500, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
I was under the impression that $(srcdir)/Kbuild was the preferred
modern name..?
--nab
> Index: lio-core/drivers/target/Kbuild
> ===================================================================
> --- lio-core.orig/drivers/target/Kbuild 2010-11-15 20:28:49.340253390 +0100
> +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> @@ -1,31 +0,0 @@
> -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
> -
> -target_core_mod-y := target_core_configfs.o \
> - target_core_device.o \
> - target_core_fabric_configfs.o \
> - target_core_fabric_lib.o \
> - target_core_hba.o \
> - target_core_pr.o \
> - target_core_alua.o \
> - target_core_scdb.o \
> - target_core_tmr.o \
> - target_core_tpg.o \
> - target_core_transport.o \
> - target_core_cdb.o \
> - target_core_ua.o \
> - target_core_rd.o \
> - target_core_mib.o
> -
> -obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
> -
> -# Subsystem modules
> -obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
> -obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
> -obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
> -obj-$(CONFIG_TCM_STGT) += target_core_stgt.o
> -
> -# Fabric modules
> -obj-$(CONFIG_LIO_TARGET) += lio-target/
> -obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop/
> -
> -obj-$(CONFIG_TCM_FC) += tcm_fc/
> Index: lio-core/drivers/target/Makefile
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ lio-core/drivers/target/Makefile 2010-11-15 20:32:13.206003355 +0100
> @@ -0,0 +1,31 @@
> +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
> +
> +target_core_mod-y := target_core_configfs.o \
> + target_core_device.o \
> + target_core_fabric_configfs.o \
> + target_core_fabric_lib.o \
> + target_core_hba.o \
> + target_core_pr.o \
> + target_core_alua.o \
> + target_core_scdb.o \
> + target_core_tmr.o \
> + target_core_tpg.o \
> + target_core_transport.o \
> + target_core_cdb.o \
> + target_core_ua.o \
> + target_core_rd.o \
> + target_core_mib.o
> +
> +obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
> +
> +# Subsystem modules
> +obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
> +obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
> +obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
> +obj-$(CONFIG_TCM_STGT) += target_core_stgt.o
> +
> +# Fabric modules
> +obj-$(CONFIG_LIO_TARGET) += lio-target/
> +obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop/
> +
> +obj-$(CONFIG_TCM_FC) += tcm_fc/
> Index: lio-core/drivers/target/tcm_fc/Kbuild
> ===================================================================
> --- lio-core.orig/drivers/target/tcm_fc/Kbuild 2010-11-15 20:32:27.637004333 +0100
> +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> @@ -1,16 +0,0 @@
> -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ \
> - -I$(srctree)/drivers/scsi/ \
> - -I$(srctree)/include/scsi/ \
> - -I$(srctree)/drivers/target/tcm_fc/
> -
> -tcm_fc-objs := \
> - tfc_cmd.o \
> - tfc_conf.o \
> - tfc_io.o \
> - tfc_sess.o
> -
> -obj-$(CONFIG_TCM_FC) += tcm_fc.o
> -
> -ifdef CONFIGFS_TCM_FC_DEBUG
> -EXTRA_CFLAGS += -DTCM_FC_DEBUG
> -endif
> Index: lio-core/drivers/target/tcm_fc/Makefile
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ lio-core/drivers/target/tcm_fc/Makefile 2010-11-15 20:32:55.127016720 +0100
> @@ -0,0 +1,15 @@
> +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ \
> + -I$(srctree)/drivers/scsi/ \
> + -I$(srctree)/include/scsi/ \
> + -I$(srctree)/drivers/target/tcm_fc/
> +
> +tcm_fc-y += tfc_cmd.o \
> + tfc_conf.o \
> + tfc_io.o \
> + tfc_sess.o
> +
> +obj-$(CONFIG_TCM_FC) += tcm_fc.o
> +
> +ifdef CONFIGFS_TCM_FC_DEBUG
> +EXTRA_CFLAGS += -DTCM_FC_DEBUG
> +endif
> Index: lio-core/drivers/target/tcm_loop/Kbuild
> ===================================================================
> --- lio-core.orig/drivers/target/tcm_loop/Kbuild 2010-11-15 20:33:03.138261841 +0100
> +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> @@ -1,11 +0,0 @@
> -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/tcm_loop/
> -
> -tcm_loop-objs := tcm_loop_fabric.o \
> - tcm_loop_fabric_scsi.o \
> - tcm_loop_configfs.o \
> -
> -obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop.o
> -
> -ifdef CONFIG_TCM_LOOP_CDB_DEBUG
> -EXTRA_CFLAGS += -DTCM_LOOP_CDB_DEBUG
> -endif
> Index: lio-core/drivers/target/tcm_loop/Makefile
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ lio-core/drivers/target/tcm_loop/Makefile 2010-11-15 20:33:14.072290333 +0100
> @@ -0,0 +1,11 @@
> +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/tcm_loop/
> +
> +tcm_loop-y := tcm_loop_fabric.o \
> + tcm_loop_fabric_scsi.o \
> + tcm_loop_configfs.o \
> +
> +obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop.o
> +
> +ifdef CONFIG_TCM_LOOP_CDB_DEBUG
> +EXTRA_CFLAGS += -DTCM_LOOP_CDB_DEBUG
> +endif
> Index: lio-core/drivers/target/lio-target/Kbuild
> ===================================================================
> --- lio-core.orig/drivers/target/lio-target/Kbuild 2010-11-15 20:33:29.942254717 +0100
> +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> @@ -1,37 +0,0 @@
> -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/lio-target
> -
> -EXTRA_CFLAGS+=-D_TARGET -DPYX_ISCSI_VENDOR='"Linux-iSCSI.org"'
> -
> -iscsi_target_mod-objs := iscsi_auth_chap.o \
> - iscsi_debug_opcodes.o \
> - iscsi_parameters.o \
> - iscsi_seq_and_pdu_list.o \
> - iscsi_serial.o \
> - iscsi_thread_queue.o \
> - iscsi_target_datain_values.o \
> - iscsi_target_device.o \
> - iscsi_target_discovery.o \
> - iscsi_target_erl0.o \
> - iscsi_target_erl1.o \
> - iscsi_target_erl2.o \
> - iscsi_target_login.o \
> - iscsi_target_nego.o \
> - iscsi_target_nodeattrib.o \
> - iscsi_target_tmr.o \
> - iscsi_target_tpg.o \
> - iscsi_target_util.o \
> - iscsi_target.o \
> - iscsi_target_configfs.o \
> - iscsi_target_mib.o
> -
> -ifdef CONFIG_LIO_TARGET_DEBUG_ERL
> -iscsi_target_mod-objs += iscsi_target_debugerl.o
> -EXTRA_CFLAGS += -DDEBUG_ERL
> -endif
> -
> -ifdef CONFIG_LIO_TARGET_DEBUG
> -EXTRA_CFLAGS += -DCONFIG_ISCSI_DEBUG=1
> -endif
> -
> -
> -obj-$(CONFIG_LIO_TARGET) += iscsi_target_mod.o
> Index: lio-core/drivers/target/lio-target/Makefile
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ lio-core/drivers/target/lio-target/Makefile 2010-11-15 20:34:18.928004914 +0100
> @@ -0,0 +1,36 @@
> +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/lio-target
> +
> +EXTRA_CFLAGS+=-D_TARGET -DPYX_ISCSI_VENDOR='"Linux-iSCSI.org"'
> +
> +iscsi_target_mod-y += iscsi_auth_chap.o \
> + iscsi_debug_opcodes.o \
> + iscsi_parameters.o \
> + iscsi_seq_and_pdu_list.o \
> + iscsi_serial.o \
> + iscsi_thread_queue.o \
> + iscsi_target_datain_values.o \
> + iscsi_target_device.o \
> + iscsi_target_discovery.o \
> + iscsi_target_erl0.o \
> + iscsi_target_erl1.o \
> + iscsi_target_erl2.o \
> + iscsi_target_login.o \
> + iscsi_target_nego.o \
> + iscsi_target_nodeattrib.o \
> + iscsi_target_tmr.o \
> + iscsi_target_tpg.o \
> + iscsi_target_util.o \
> + iscsi_target.o \
> + iscsi_target_configfs.o \
> + iscsi_target_mib.o
> +
> +ifdef CONFIG_LIO_TARGET_DEBUG_ERL
> +iscsi_target_mod-y += iscsi_target_debugerl.o
> +EXTRA_CFLAGS += -DDEBUG_ERL
> +endif
> +
> +ifdef CONFIG_LIO_TARGET_DEBUG
> +EXTRA_CFLAGS += -DCONFIG_ISCSI_DEBUG=1
> +endif
> +
> +obj-$(CONFIG_LIO_TARGET) += iscsi_target_mod.o
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] target: rename Kbuild files to Makefile
2010-11-15 20:32 ` Nicholas A. Bellinger
@ 2010-11-15 20:55 ` Nicholas A. Bellinger
2010-11-16 10:32 ` Boaz Harrosh
0 siblings, 1 reply; 4+ messages in thread
From: Nicholas A. Bellinger @ 2010-11-15 20:55 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-scsi, Boaz Harrosh
On Mon, 2010-11-15 at 12:32 -0800, Nicholas A. Bellinger wrote:
> On Mon, 2010-11-15 at 14:43 -0500, Christoph Hellwig wrote:
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> >
>
> I was under the impression that $(srcdir)/Kbuild was the preferred
> modern name..?
>
This is in fact mainline convention, commited as 9093542.
Thanks!
--nab
> --nab
>
> > Index: lio-core/drivers/target/Kbuild
> > ===================================================================
> > --- lio-core.orig/drivers/target/Kbuild 2010-11-15 20:28:49.340253390 +0100
> > +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> > @@ -1,31 +0,0 @@
> > -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
> > -
> > -target_core_mod-y := target_core_configfs.o \
> > - target_core_device.o \
> > - target_core_fabric_configfs.o \
> > - target_core_fabric_lib.o \
> > - target_core_hba.o \
> > - target_core_pr.o \
> > - target_core_alua.o \
> > - target_core_scdb.o \
> > - target_core_tmr.o \
> > - target_core_tpg.o \
> > - target_core_transport.o \
> > - target_core_cdb.o \
> > - target_core_ua.o \
> > - target_core_rd.o \
> > - target_core_mib.o
> > -
> > -obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
> > -
> > -# Subsystem modules
> > -obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
> > -obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
> > -obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
> > -obj-$(CONFIG_TCM_STGT) += target_core_stgt.o
> > -
> > -# Fabric modules
> > -obj-$(CONFIG_LIO_TARGET) += lio-target/
> > -obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop/
> > -
> > -obj-$(CONFIG_TCM_FC) += tcm_fc/
> > Index: lio-core/drivers/target/Makefile
> > ===================================================================
> > --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> > +++ lio-core/drivers/target/Makefile 2010-11-15 20:32:13.206003355 +0100
> > @@ -0,0 +1,31 @@
> > +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
> > +
> > +target_core_mod-y := target_core_configfs.o \
> > + target_core_device.o \
> > + target_core_fabric_configfs.o \
> > + target_core_fabric_lib.o \
> > + target_core_hba.o \
> > + target_core_pr.o \
> > + target_core_alua.o \
> > + target_core_scdb.o \
> > + target_core_tmr.o \
> > + target_core_tpg.o \
> > + target_core_transport.o \
> > + target_core_cdb.o \
> > + target_core_ua.o \
> > + target_core_rd.o \
> > + target_core_mib.o
> > +
> > +obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
> > +
> > +# Subsystem modules
> > +obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
> > +obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
> > +obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
> > +obj-$(CONFIG_TCM_STGT) += target_core_stgt.o
> > +
> > +# Fabric modules
> > +obj-$(CONFIG_LIO_TARGET) += lio-target/
> > +obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop/
> > +
> > +obj-$(CONFIG_TCM_FC) += tcm_fc/
> > Index: lio-core/drivers/target/tcm_fc/Kbuild
> > ===================================================================
> > --- lio-core.orig/drivers/target/tcm_fc/Kbuild 2010-11-15 20:32:27.637004333 +0100
> > +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> > @@ -1,16 +0,0 @@
> > -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ \
> > - -I$(srctree)/drivers/scsi/ \
> > - -I$(srctree)/include/scsi/ \
> > - -I$(srctree)/drivers/target/tcm_fc/
> > -
> > -tcm_fc-objs := \
> > - tfc_cmd.o \
> > - tfc_conf.o \
> > - tfc_io.o \
> > - tfc_sess.o
> > -
> > -obj-$(CONFIG_TCM_FC) += tcm_fc.o
> > -
> > -ifdef CONFIGFS_TCM_FC_DEBUG
> > -EXTRA_CFLAGS += -DTCM_FC_DEBUG
> > -endif
> > Index: lio-core/drivers/target/tcm_fc/Makefile
> > ===================================================================
> > --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> > +++ lio-core/drivers/target/tcm_fc/Makefile 2010-11-15 20:32:55.127016720 +0100
> > @@ -0,0 +1,15 @@
> > +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ \
> > + -I$(srctree)/drivers/scsi/ \
> > + -I$(srctree)/include/scsi/ \
> > + -I$(srctree)/drivers/target/tcm_fc/
> > +
> > +tcm_fc-y += tfc_cmd.o \
> > + tfc_conf.o \
> > + tfc_io.o \
> > + tfc_sess.o
> > +
> > +obj-$(CONFIG_TCM_FC) += tcm_fc.o
> > +
> > +ifdef CONFIGFS_TCM_FC_DEBUG
> > +EXTRA_CFLAGS += -DTCM_FC_DEBUG
> > +endif
> > Index: lio-core/drivers/target/tcm_loop/Kbuild
> > ===================================================================
> > --- lio-core.orig/drivers/target/tcm_loop/Kbuild 2010-11-15 20:33:03.138261841 +0100
> > +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> > @@ -1,11 +0,0 @@
> > -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/tcm_loop/
> > -
> > -tcm_loop-objs := tcm_loop_fabric.o \
> > - tcm_loop_fabric_scsi.o \
> > - tcm_loop_configfs.o \
> > -
> > -obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop.o
> > -
> > -ifdef CONFIG_TCM_LOOP_CDB_DEBUG
> > -EXTRA_CFLAGS += -DTCM_LOOP_CDB_DEBUG
> > -endif
> > Index: lio-core/drivers/target/tcm_loop/Makefile
> > ===================================================================
> > --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> > +++ lio-core/drivers/target/tcm_loop/Makefile 2010-11-15 20:33:14.072290333 +0100
> > @@ -0,0 +1,11 @@
> > +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/tcm_loop/
> > +
> > +tcm_loop-y := tcm_loop_fabric.o \
> > + tcm_loop_fabric_scsi.o \
> > + tcm_loop_configfs.o \
> > +
> > +obj-$(CONFIG_TCM_LOOP_FABRIC) += tcm_loop.o
> > +
> > +ifdef CONFIG_TCM_LOOP_CDB_DEBUG
> > +EXTRA_CFLAGS += -DTCM_LOOP_CDB_DEBUG
> > +endif
> > Index: lio-core/drivers/target/lio-target/Kbuild
> > ===================================================================
> > --- lio-core.orig/drivers/target/lio-target/Kbuild 2010-11-15 20:33:29.942254717 +0100
> > +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
> > @@ -1,37 +0,0 @@
> > -EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/lio-target
> > -
> > -EXTRA_CFLAGS+=-D_TARGET -DPYX_ISCSI_VENDOR='"Linux-iSCSI.org"'
> > -
> > -iscsi_target_mod-objs := iscsi_auth_chap.o \
> > - iscsi_debug_opcodes.o \
> > - iscsi_parameters.o \
> > - iscsi_seq_and_pdu_list.o \
> > - iscsi_serial.o \
> > - iscsi_thread_queue.o \
> > - iscsi_target_datain_values.o \
> > - iscsi_target_device.o \
> > - iscsi_target_discovery.o \
> > - iscsi_target_erl0.o \
> > - iscsi_target_erl1.o \
> > - iscsi_target_erl2.o \
> > - iscsi_target_login.o \
> > - iscsi_target_nego.o \
> > - iscsi_target_nodeattrib.o \
> > - iscsi_target_tmr.o \
> > - iscsi_target_tpg.o \
> > - iscsi_target_util.o \
> > - iscsi_target.o \
> > - iscsi_target_configfs.o \
> > - iscsi_target_mib.o
> > -
> > -ifdef CONFIG_LIO_TARGET_DEBUG_ERL
> > -iscsi_target_mod-objs += iscsi_target_debugerl.o
> > -EXTRA_CFLAGS += -DDEBUG_ERL
> > -endif
> > -
> > -ifdef CONFIG_LIO_TARGET_DEBUG
> > -EXTRA_CFLAGS += -DCONFIG_ISCSI_DEBUG=1
> > -endif
> > -
> > -
> > -obj-$(CONFIG_LIO_TARGET) += iscsi_target_mod.o
> > Index: lio-core/drivers/target/lio-target/Makefile
> > ===================================================================
> > --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> > +++ lio-core/drivers/target/lio-target/Makefile 2010-11-15 20:34:18.928004914 +0100
> > @@ -0,0 +1,36 @@
> > +EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/lio-target
> > +
> > +EXTRA_CFLAGS+=-D_TARGET -DPYX_ISCSI_VENDOR='"Linux-iSCSI.org"'
> > +
> > +iscsi_target_mod-y += iscsi_auth_chap.o \
> > + iscsi_debug_opcodes.o \
> > + iscsi_parameters.o \
> > + iscsi_seq_and_pdu_list.o \
> > + iscsi_serial.o \
> > + iscsi_thread_queue.o \
> > + iscsi_target_datain_values.o \
> > + iscsi_target_device.o \
> > + iscsi_target_discovery.o \
> > + iscsi_target_erl0.o \
> > + iscsi_target_erl1.o \
> > + iscsi_target_erl2.o \
> > + iscsi_target_login.o \
> > + iscsi_target_nego.o \
> > + iscsi_target_nodeattrib.o \
> > + iscsi_target_tmr.o \
> > + iscsi_target_tpg.o \
> > + iscsi_target_util.o \
> > + iscsi_target.o \
> > + iscsi_target_configfs.o \
> > + iscsi_target_mib.o
> > +
> > +ifdef CONFIG_LIO_TARGET_DEBUG_ERL
> > +iscsi_target_mod-y += iscsi_target_debugerl.o
> > +EXTRA_CFLAGS += -DDEBUG_ERL
> > +endif
> > +
> > +ifdef CONFIG_LIO_TARGET_DEBUG
> > +EXTRA_CFLAGS += -DCONFIG_ISCSI_DEBUG=1
> > +endif
> > +
> > +obj-$(CONFIG_LIO_TARGET) += iscsi_target_mod.o
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] target: rename Kbuild files to Makefile
2010-11-15 20:55 ` Nicholas A. Bellinger
@ 2010-11-16 10:32 ` Boaz Harrosh
0 siblings, 0 replies; 4+ messages in thread
From: Boaz Harrosh @ 2010-11-16 10:32 UTC (permalink / raw)
To: Nicholas A. Bellinger; +Cc: Christoph Hellwig, linux-scsi
On 11/15/2010 10:55 PM, Nicholas A. Bellinger wrote:
> On Mon, 2010-11-15 at 12:32 -0800, Nicholas A. Bellinger wrote:
>> On Mon, 2010-11-15 at 14:43 -0500, Christoph Hellwig wrote:
>>> Signed-off-by: Christoph Hellwig <hch@lst.de>
>>>
>>
>> I was under the impression that $(srcdir)/Kbuild was the preferred
>> modern name..?
>>
>
> This is in fact mainline convention, commited as 9093542.
>
> Thanks!
>
> --nab
[Rant below please ignore]
>From Documentation/kbuild/makefiles.txt
=== 3 The kbuild files
Most Makefiles within the kernel are kbuild Makefiles that use the
kbuild infrastructure. This chapter introduces the syntax used in the
kbuild makefiles.
The preferred name for the kbuild files are 'Makefile' but 'Kbuild' can
be used and if both a 'Makefile' and a 'Kbuild' file exists, then the 'Kbuild'
file will be used.
This has changed since the time I started. Back then that text was:
The preferred name for the kbuild files are Kbuild
If I go to a random subdirectory in the Kernel and do:
[drivers/foo]$ make
With a Kbuild file it outputs:
make: *** No targets specified and no makefile found. Stop.
With a Makefile it outputs:
make: *** No targets. Stop.
Sigh! For me a "Makefile" is a make's makefile. Kbuild files are
not makefiles and should not be named as one.
But that's a lost cause
Boaz
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-16 10:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-15 19:43 [PATCH 2/2] target: rename Kbuild files to Makefile Christoph Hellwig
2010-11-15 20:32 ` Nicholas A. Bellinger
2010-11-15 20:55 ` Nicholas A. Bellinger
2010-11-16 10:32 ` Boaz Harrosh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox