From 768326624de9be7229980ceb7a35943b6fba1a6b Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Tue, 14 Jul 2015 14:01:15 -0700 Subject: Use system-wide open-isns, not internal version. This preceeds removing of the internal version of open-isns. All open-isns includes are changed from "file.h" to , and the Makefiles remove all use of the local open-isns files. --- Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1ef9273..c8cd00e 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ ifdef OPTFLAGS CFLAGS = $(OPTFLAGS) endif -# Export it so configure of iscsiuio & open-isns will +# Export it so configure of iscsiuio will # pick it up. ifneq (,$(CFLAGS)) export CFLAGS @@ -37,8 +37,7 @@ endif all: user -user: utils/open-isns/Makefile iscsiuio/Makefile - $(MAKE) -C utils/open-isns +user: iscsiuio/Makefile $(MAKE) -C utils/sysdeps $(MAKE) -C utils/fwparam_ibft $(MAKE) -C usr @@ -54,9 +53,6 @@ user: utils/open-isns/Makefile iscsiuio/Makefile @echo @echo "Read README file for detailed information." -utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in - cd utils/open-isns; ./configure --with-security=no - iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in cd iscsiuio; ./configure @@ -82,8 +78,6 @@ clean: $(MAKE) -C kernel clean [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean - [ ! -f utils/open-isns/Makefile ] || $(MAKE) -C utils/open-isns clean - [ ! -f utils/open-isns/Makefile ] || $(MAKE) -C utils/open-isns distclean # this is for safety # now -jXXX will still be safe -- cgit v1.2.1