Makefiles: Stop using $(SUBDIRS) (merge r7851 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7898 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-01-13 21:57:33 +00:00
parent 097385d9fc
commit db55949455
14 changed files with 50 additions and 53 deletions

View File

@@ -44,7 +44,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) $(FCSTFLAGS$(BUILDMODE))
MODULE_NAME = fcst
ifneq ($(KERNELRELEASE),)
include $(SUBDIRS)/Makefile_in-tree
include $(KBUILD_EXTMOD)/Makefile_in-tree
else
######### BEGIN OUT-OF-TREE RULES #########
@@ -78,15 +78,15 @@ SCST_DIR := $(shell if [ -e "$$PWD/../scst" ]; then echo "$$PWD/../scst/src"; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
all: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
SCST_INC_DIR=$(SCST_INC_DIR)
tgt: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=n \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n \
SCST_INC_DIR=$(SCST_INC_DIR)
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install

View File

@@ -3,7 +3,6 @@
#
SCST_DIR := $(shell pwd)/../scst/src
SUBDIRS := $(shell pwd)
ifeq ($(KVER),)
ifeq ($(KDIR),)
@@ -35,10 +34,10 @@ MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \
all: src/$(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src modules
$(MAKE) -C $(KDIR) M=$(shell pwd)/src modules
install: all src/ibmvstgt.ko
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \
$(MAKE) -C $(KDIR) M=$(shell pwd)/src \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
@@ -50,7 +49,7 @@ src/Module.symvers src/Modules.symvers: $(SCST_DIR)/$(MODULE_SYMVERS)
cp $< $@;
clean:
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src clean
$(MAKE) -C $(KDIR) M=$(shell pwd)/src clean
rm -f src/Modules.symvers src/Module.symvers src/Module.markers \
src/modules.order

View File

@@ -1,4 +1,4 @@
EXTRA_CFLAGS += -I$(SUBDIRS)/../../scst/include
EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../scst/include
EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG
#EXTRA_CFLAGS += -g -fno-inline -fno-inline-functions

View File

@@ -11,8 +11,6 @@ endif
SHELL=/bin/bash
SUBDIRS := $(shell pwd)
SCST_INC_DIR := $(shell \
if [ -e "$$PWD/../scst" ]; then \
echo "$$PWD/../scst/include"; \
@@ -113,7 +111,7 @@ else
endif
# Use make instead of $(MAKE) to get rid of command-line option -i
run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi)
run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi)
run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0)
CONFTESTS = $(shell ls -d conftest/*)
@@ -131,12 +129,12 @@ ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(PRE_CFLAGS)
mods: include/iscsi_scst_itf_ver.h Modules.symvers Module.symvers \
$(CONFTEST_OUTPUTS)
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) M=$(KMOD) \
PRE_CFLAGS="$(PRE_CFLAGS)" modules
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
echo " Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD) \
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) M=$(ISERTMOD) \
PRE_CFLAGS="$(ISER_CFLAGS)" \
KBUILD_EXTRA_SYMBOLS=$(ISER_SYMVERS) modules; \
fi
@@ -157,12 +155,12 @@ install: all
@install -vD -m 644 doc/manpages/iscsi-scstd.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scstd.8
@install -vD -m 755 usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
@install -vD -m 644 doc/manpages/iscsi-scst-adm.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scst-adm.8
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) M=$(KMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD) \
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) M=$(ISERTMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install; \
fi
@@ -204,8 +202,8 @@ endif
clean:
$(MAKE) -C usr $@
$(MAKE) -C $(KDIR) SUBDIRS=$(KMOD) $@
$(MAKE) -C $(KDIR) SUBDIRS=$(ISERTMOD) $@
$(MAKE) -C $(KDIR) M=$(KMOD) $@
$(MAKE) -C $(KDIR) M=$(ISERTMOD) $@
rm -f kernel/Modules.symvers kernel/Module.symvers \
kernel/Module.markers kernel/modules.order \
kernel/isert-scst/Modules.symvers kernel/isert-scst/Module.symvers \

View File

@@ -5,7 +5,6 @@
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (not a .c file).
SUBDIRS := $(shell pwd)
SBINDIR := /usr/local/sbin
INITDIR := /etc/init.d
RCDIR := /etc/rc.d

View File

@@ -26,7 +26,7 @@ endif
#SCST_INC_DIR := $(PREFIX)/include/scst
#SCST_DIR := $(SCST_INC_DIR)
SCST_INC_DIR := $(SUBDIRS)/../scst/include
SCST_INC_DIR := $(KBUILD_EXTMOD)/../scst/include
SCST_DIR := $(shell pwd)/../scst/src
EXTRA_CFLAGS += -I$(SCST_INC_DIR)
@@ -67,13 +67,13 @@ else
######### BEGIN OUT-OF-TREE RULES #########
all: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m
tgt: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=n
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install

View File

@@ -55,7 +55,7 @@ export LIBSAS := m
#SCST_INC_DIR := $(PREFIX)/include/scst
#SCST_DIR := $(SCST_INC_DIR)
SCST_INC_DIR := $(SUBDIRS)/../scst/include
SCST_INC_DIR := $(KBUILD_EXTMOD)/../scst/include
SCST_DIR := $(shell pwd)/../scst/src
EXTRA_CFLAGS += -I$(SCST_INC_DIR)
@@ -82,13 +82,13 @@ else
######### BEGIN OUT-OF-TREE RULES #########
all: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m
tgt: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=n
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install

View File

@@ -61,10 +61,10 @@ qla2xxx_scst-objs := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o
else
all:
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
@@ -76,7 +76,7 @@ uninstall:
endif
clean:
@$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) clean
@$(MAKE) -C $(KDIR) M=$(shell pwd) clean
@$(RM) tags Modules.symvers module.symvers Module.markers modules.order
extraclean: clean

View File

@@ -63,7 +63,7 @@ endif
ifeq ($(BUILD_2X_MODULE),)
QLA2XXX_INC_DIR := $(KDIR)/drivers/scsi/qla2xxx
else
QLA2XXX_INC_DIR := $(SUBDIRS)/..
QLA2XXX_INC_DIR := $(KBUILD_EXTMOD)/..
QLA2XXX_DIR := $(shell pwd)/..
QLA2XXX_SCST := qla2xxx_scst
EXTRA_CFLAGS += -DCONFIG_SCSI_QLA2XXX_TARGET=y
@@ -96,21 +96,21 @@ ifneq ($(BUILD_2X_MODULE),)
endif
all: $(QLA2XXX_SCST) Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
SCST_INC_DIR=$(SCST_INC_DIR)
install: all
ifneq ($(BUILD_2X_MODULE),)
$(MAKE) SUBDIRS=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@ \
$(MAKE) M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@ \
SCST_INC_DIR=$(SCST_INC_DIR)
endif
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install
uninstall:
ifneq ($(BUILD_2X_MODULE),)
$(MAKE) SUBDIRS=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@
$(MAKE) M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@
endif
rm -f $(INSTALL_DIR)/qla2[23x]00tgt.ko
-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
@@ -118,7 +118,7 @@ endif
ifneq ($(BUILD_2X_MODULE),)
qla2xxx_scst:
$(MAKE) BUILD_2X_MODULE=$(BUILD_2X_MODULE) CONFIG_SCSI_QLA2XXX_TARGET=y \
SUBDIRS=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) all
M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) all
endif
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)

View File

@@ -36,7 +36,7 @@ SHELL=/bin/bash
DEV_HANDLERS_DIR = dev_handlers
ifneq ($(PATCHLEVEL),)
SCST_INC_DIR := $(SUBDIRS)/../include
SCST_INC_DIR := $(KBUILD_EXTMOD)/../include
obj-m := scst.o
@@ -94,10 +94,10 @@ $(SCST_INTF_VER_FILE): $(SCST_INC_DIR)/scst.h $(SCST_INC_DIR)/scst_const.h $(SCS
echo "\"`sha1sum $(SCST_INC_DIR)/scst_user.h|awk '{printf $$1}'`\"" >>$(SCST_INTF_VER_FILE)
all: $(SCST_INTF_VER_FILE)
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_DEV=m
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=m
scst:
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_DEV=n
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=n
# The file Modules.symvers has been renamed in the 2.6.18 kernel to
# Module.symvers. Find out which name to use by looking in $(KDIR).
@@ -110,9 +110,9 @@ install: all
echo Error: the scst and/or scst-devel RPMs must be uninstalled first; \
false; fi
-rm -f $(INSTALL_DIR)/scsi_tgt.ko
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/dev_handlers \
$(MAKE) -C $(KDIR) M=$(shell pwd)/dev_handlers \
modules_install
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) \
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true)\
modules_install
install -d $(INSTALL_DIR_H)

View File

@@ -30,7 +30,7 @@
SHELL=/bin/bash
ifneq ($(PATCHLEVEL),)
SCST_INC_DIR := $(SUBDIRS)/../include
SCST_INC_DIR := $(KBUILD_EXTMOD)/../include
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
@@ -58,11 +58,11 @@ endif
INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
all:
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)
$(MAKE) -C $(KDIR) M=$(shell pwd)
install: all
mkdir -p $(DESTDIR)/var/lib/scst/vdev_mode_pages
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) \
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
@@ -74,7 +74,8 @@ endif
enable-Wextra = $(shell uname_r="$$(uname -r)"; if [ "$${uname_r%.el5}" = "$${uname_r}" ]; then echo "$(1)"; fi)
EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) $(call enable-Wextra,-Wextra \
EXTRA_CFLAGS += -I$(KBUILD_EXTMOD) -I$(SCST_INC_DIR) \
$(call enable-Wextra,-Wextra \
-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare)
EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS

View File

@@ -56,11 +56,11 @@ SCST_DIR := $(shell if [ -e "$$PWD/../scst" ]; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
all: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
SCST_INC_DIR=$(SCST_INC_DIR)
install: all
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install
@@ -89,7 +89,7 @@ uninstall:
endif
clean:
@$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) clean
@$(MAKE) -C $(KDIR) M=$(shell pwd) clean
@$(RM) tags Modules.symvers module.symvers Module.markers modules.order
extraclean: clean

View File

@@ -94,7 +94,7 @@ OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS)
endif
# Use make instead of $(MAKE) to get rid of command-line option -i
run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi)
run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi)
run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0)
CONFTESTS = $(shell ls -d conftest/*)
@@ -110,7 +110,7 @@ PRE_CFLAGS = $(OFED_CFLAGS) \
done)
all: check src/$(MODULE_SYMVERS) $(CONFTEST_OUTPUTS)
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \
$(MAKE) -C $(KDIR) M=$(shell pwd)/src \
PRE_CFLAGS="$(PRE_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) modules
src/$(MODULE_SYMVERS): $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS) \
@@ -122,7 +122,7 @@ install: all
@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \
find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \
true
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \
$(MAKE) -C $(KDIR) M=$(shell pwd)/src \
PRE_CFLAGS="$(PRE_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
@@ -154,7 +154,7 @@ check:
clean:
rm -rf conftest/pre_cflags conftest/kcflags
for d in conftest/* src; do \
[ -d "$$d" ] && $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/$$d clean; \
[ -d "$$d" ] && $(MAKE) -C $(KDIR) M=$(shell pwd)/$$d clean; \
rm -f $$d/result*.txt; \
done
rm -f src/$(MODULE_SYMVERS) src/Module.markers src/modules.order

View File

@@ -2,7 +2,7 @@ LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
CPPFLAGS := $(PRE_CFLAGS) $(CPPFLAGS)
EXTRA_CFLAGS += -I$(SCST_INC_DIR)
-include $(SUBDIRS)/../build_mode
-include $(KBUILD_EXTMOD)/../build_mode
SRPTFLAGS = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \
-DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions