1 diff --git a/libiscsi/Makefile b/libiscsi/Makefile
2 index 4aeb44f..a91d6b8 100644
3 --- a/libiscsi/Makefile
4 +++ b/libiscsi/Makefile
6 OSNAME=$(shell uname -s)
8 WARNFLAGS ?= -Wall -Wstrict-prototypes
9 -CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -I../utils/open-isns \
10 +CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
11 -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
13 TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
14 @@ -43,11 +43,10 @@ fw-objs/%.o: ../utils/fwparam_ibft/%.c
15 $(CC) $(CFLAGS) -c $< -o $@
17 $(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
18 - $(CC) $(CFLAGS) -L../utils/open-isns -lisns -shared -Wl,-soname,$(LIB) $^ -o $@
19 + $(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@
20 ln -s -f $(LIB) libiscsi.so
22 $(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)
23 - $(CC) $(CFLAGS) -L../utils/open-isns -lisns -c $< -o $@
25 html: libiscsi.h libiscsi.doxy
27 diff --git a/usr/Makefile b/usr/Makefile
28 index 8e505bf..13a60f9 100644
31 @@ -31,7 +31,7 @@ endif
33 WARNFLAGS ?= -Wall -Wstrict-prototypes
34 CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
35 - -D$(OSNAME) $(IPC_CFLAGS)
36 + -D$(OSNAME) $(IPC_CFLAGS) -DISNS_ENABLE
37 PROGRAMS = iscsid iscsiadm iscsistart
40 diff --git a/usr/discovery.c b/usr/discovery.c
41 index 2233de7..02c6f25 100644
45 #include "iscsid_req.h"
46 #include "iscsi_util.h"
47 /* libisns includes */
55 #include "iscsi-slp-discovery.h"
56 @@ -94,6 +96,7 @@ static int request_initiator_name(void)
61 void discovery_isns_free_servername(void)
63 if (isns_config.ic_server_name)
64 @@ -367,6 +370,7 @@ retry:
65 discovery_isns_free_servername();
70 int discovery_fw(void *data, struct iface_rec *iface,
71 struct list_head *rec_list)