From: Lee Duncan <[email protected]>
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.
---
Makefile | 10 ++--------
usr/Makefile | 7 +++----
usr/discovery.c | 6 +++---
usr/discoveryd.c | 8 ++++----
usr/iscsiadm.c | 2 +-
5 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
index 1ef9273d8eaa..c8cd00e09b00 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
diff --git a/usr/Makefile b/usr/Makefile
index e23fee1c535e..5ac0726a4e83 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -30,8 +30,7 @@ endif
CFLAGS ?= -O2 -g
WARNFLAGS ?= -Wall -Wstrict-prototypes
-CFLAGS += $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
- -D$(OSNAME) $(IPC_CFLAGS)
+CFLAGS += $(WARNFLAGS) -I../include -I. -D$(OSNAME) $(IPC_CFLAGS)
PROGRAMS = iscsid iscsiadm iscsistart
# libc compat files
@@ -55,10 +54,10 @@ all: $(PROGRAMS)
iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
iscsid.o session_mgmt.o discoveryd.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lrt
-lmount
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount
iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto
iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
iscsistart.o statics.o
diff --git a/usr/discovery.c b/usr/discovery.c
index 38968ca895b8..43c2359cdcbc 100644
--- a/usr/discovery.c
+++ b/usr/discovery.c
@@ -50,9 +50,9 @@
#include "iscsi_timer.h"
#include "iscsi_err.h"
/* libisns includes */
-#include "isns.h"
-#include "paths.h"
-#include "message.h"
+#include <libisns/isns.h>
+#include <libisns/paths.h>
+#include <libisns/message.h>
#ifdef SLP_ENABLE
#include "iscsi-slp-discovery.h"
diff --git a/usr/discoveryd.c b/usr/discoveryd.c
index 1e149771a50b..f5359c741efe 100644
--- a/usr/discoveryd.c
+++ b/usr/discoveryd.c
@@ -40,11 +40,11 @@
#include "iface.h"
#include "session_mgmt.h"
#include "session_info.h"
-#include "isns-proto.h"
-#include "isns.h"
-#include "paths.h"
-#include "message.h"
#include "iscsi_err.h"
+#include <libisns/isns-proto.h>
+#include <libisns/isns.h>
+#include <libisns/paths.h>
+#include <libisns/message.h>
#define DISC_DEF_POLL_INVL 30
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index aa7cf07a08ec..692981d3775d 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -49,7 +49,7 @@
#include "idbm_fields.h"
#include "session_mgmt.h"
#include "iscsid_req.h"
-#include "isns-proto.h"
+#include <libisns/isns-proto.h>
#include "iscsi_err.h"
#include "iscsi_ipc.h"
#include "iscsi_timer.h"
--
2.1.4
--
You received this message because you are subscribed to the Google Groups
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.
