|
 |
c2d5d21 |
From c9ff6b4ce766a25da4a2e9f9f4836139c9c2331e Mon Sep 17 00:00:00 2001
|
|
|
c2d5d21 |
From: Eddie Wai <eddie.wai@broadcom.com>
|
|
|
c2d5d21 |
Date: Fri, 15 Feb 2013 16:58:37 -0800
|
|
|
c2d5d21 |
Subject: ISCSID: Modified the Makefile for iscsiuio compilation
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
This patch modifies the open-iscsi Makefile to include the compilation,
|
|
|
c2d5d21 |
binary/manpage install, and clean of the iscsiuio source.
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
|
|
|
c2d5d21 |
---
|
|
|
c2d5d21 |
Makefile | 12 +++++++++---
|
|
|
c2d5d21 |
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
diff --git a/Makefile b/Makefile
|
|
|
c2d5d21 |
index c5d9700..0b7bb98 100644
|
|
|
c2d5d21 |
--- a/Makefile
|
|
|
c2d5d21 |
+++ b/Makefile
|
|
|
c2d5d21 |
@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man
|
|
|
c2d5d21 |
etcdir = /etc
|
|
|
c2d5d21 |
initddir = $(etcdir)/init.d
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
-MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8
|
|
|
c2d5d21 |
-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname
|
|
|
c2d5d21 |
+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 iscsiuio/docs/iscsiuio.8
|
|
|
c2d5d21 |
+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname iscsiuio/src/unix/iscsiuio
|
|
|
c2d5d21 |
INSTALL = install
|
|
|
c2d5d21 |
ETCFILES = etc/iscsid.conf
|
|
|
c2d5d21 |
IFACEFILES = etc/iface.example
|
|
|
c2d5d21 |
@@ -26,24 +26,29 @@ IFACEFILES = etc/iface.example
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
all: user
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
-user: utils/open-isns/Makefile
|
|
|
c2d5d21 |
+user: utils/open-isns/Makefile iscsiuio/Makefile
|
|
|
c2d5d21 |
$(MAKE) -C utils/open-isns
|
|
|
c2d5d21 |
$(MAKE) -C utils/sysdeps
|
|
|
c2d5d21 |
$(MAKE) -C utils/fwparam_ibft
|
|
|
c2d5d21 |
$(MAKE) -C usr
|
|
|
c2d5d21 |
$(MAKE) -C utils
|
|
|
c2d5d21 |
+ $(MAKE) -C iscsiuio
|
|
|
c2d5d21 |
@echo
|
|
|
c2d5d21 |
@echo "Compilation complete Output file"
|
|
|
c2d5d21 |
@echo "----------------------------------- ----------------"
|
|
|
c2d5d21 |
@echo "Built iSCSI daemon: usr/iscsid"
|
|
|
c2d5d21 |
@echo "Built management application: usr/iscsiadm"
|
|
|
c2d5d21 |
@echo "Built boot tool: usr/iscsistart"
|
|
|
c2d5d21 |
+ @echo "Built iscsiuio daemon: iscsiuio/src/unix/iscsiuio"
|
|
|
c2d5d21 |
@echo
|
|
|
c2d5d21 |
@echo "Read README file for detailed information."
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in
|
|
|
c2d5d21 |
cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
+iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
|
|
|
c2d5d21 |
+ cd iscsiuio; ./configure
|
|
|
c2d5d21 |
+
|
|
|
c2d5d21 |
kernel: force
|
|
|
c2d5d21 |
$(MAKE) -C kernel
|
|
|
c2d5d21 |
@echo "Kernel Compilation complete Output file"
|
|
|
c2d5d21 |
@@ -61,6 +66,7 @@ clean:
|
|
|
c2d5d21 |
$(MAKE) -C utils clean
|
|
|
c2d5d21 |
$(MAKE) -C usr clean
|
|
|
c2d5d21 |
$(MAKE) -C kernel clean
|
|
|
c2d5d21 |
+ $(MAKE) -C iscsiuio clean
|
|
|
c2d5d21 |
$(MAKE) -C utils/open-isns clean
|
|
|
c2d5d21 |
$(MAKE) -C utils/open-isns distclean
|
|
|
c2d5d21 |
|
|
|
c2d5d21 |
--
|
|
|
c2d5d21 |
1.8.1.4
|
|
|
c2d5d21 |
|