summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2015-07-14 14:01:15 -0700
committerMike Christie <michaelc@cs.wisc.edu>2015-08-24 20:24:49 -0500
commit768326624de9be7229980ceb7a35943b6fba1a6b (patch)
treebab639e4d63e6544b4d501a1f05c8350a0f815de /Makefile
parent1dfb88a4dfd8e8185491061f557a0c23c522f314 (diff)
downloadopen-iscsi-768326624de9be7229980ceb7a35943b6fba1a6b.tar.gz
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 <libisns/file.h>, and the Makefiles remove all use of the local open-isns files.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 2 insertions, 8 deletions
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