File iscsi-initiator-utils-build-fw-as-lib.patch of Package iscsi-initiator-utils870.3

File iscsi-initiator-utils-build-fw-as-lib.patch of Package iscsi-initiator-utils870.3 (Revision 771a159b8fc490309daea04c46e16583)

Currently displaying revision 771a159b8fc490309daea04c46e16583, show latest

diff -aurp open-iscsi-2.0-868-test1/usr/Makefile open-iscsi-2.0-868-test1.work/usr/Makefile
--- open-iscsi-2.0-868-test1/usr/Makefile	2008-08-26 03:40:34.000000000 -0500
+++ open-iscsi-2.0-868-test1.work/usr/Makefile	2008-08-26 04:12:21.000000000 -0500
@@ -40,24 +40,24 @@ COMMON_SRCS =  $(ISCSI_LIB_SRCS)
 # core initiator files
 INITIATOR_SRCS = initiator.o scsi.o actor.o mgmt_ipc.o isns.o transport.o
 # fw boot files
-FW_BOOT_SRCS = $(wildcard ../utils/fwparam_ibft/*.o)
+FW_BOOT_LIB_PATH = $(wildcard ../utils/fwparam_ibft/)
 
 all: $(PROGRAMS)
 
 iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
 	$(CC) $(CFLAGS) $^ -o $@
 
-iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
-	$(CC) $(CFLAGS) $^ -o $@
+iscsiadm: $(COMMON_SRCS)  strings.o discovery.o iscsiadm.o
+	$(CC) $(CFLAGS) -L$(FW_BOOT_LIB_PATH) $^ -o $@ -lfwparam
 
-iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS)  \
 		iscsistart.o statics.o
-	$(CC) $(CFLAGS) -static $^ -o $@
+	$(CC) $(CFLAGS) -static -L$(FW_BOOT_LIB_PATH) $^ -o $@ -lfwparam
 
 clean:
 	rm -f *.o $(PROGRAMS) .depend
 
 depend:
-	gcc $(CFLAGS) -M `ls *.c` > .depend
+	gcc $(CFLAGS) -L$(FW_BOOT_LIB_PATH) -lfwparam -M `ls *.c` > .depend
 
 -include .depend
diff -aurp open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/Makefile
--- open-iscsi-2.0-868-test1/utils/fwparam_ibft/Makefile	2008-08-26 03:40:34.000000000 -0500
+++ open-iscsi-2.0-868-test1.work/utils/fwparam_ibft/Makefile	2008-08-26 04:13:33.000000000 -0500
@@ -24,7 +24,8 @@
 OBJS := fwparam_ibft.o fw_entry.o fwparam_ibft_sysfs.o
 OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o
 GENFILES := prom_lex.c prom_parse.tab.c prom_parse.tab.h
-CLEANFILES = $(OBJS) $(GENFILES) *.output *~
+LIB=libfwparam.a
+CLEANFILES = $(OBJS) $(LIB) *.output *~
 BISONFLAGS = -d
 FLEXFLAGS =  -t
 # turn off #line number markers
@@ -38,7 +39,7 @@ OPTFLAGS ?= -O2 -g -fPIC
 WARNFLAGS ?= -Wall -Wstrict-prototypes
 CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../../include
 
-all: $(OBJS)
+all: $(LIB)
 
 clean:
 	rm -f *.o $(CLEANFILES) .depend
@@ -54,6 +55,9 @@ $(GENFILES): Makefile
 $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
 
 depend:
-	gcc $(CFLAGS) -M `ls *.c` > .depend
+	gcc $(CFLAGS) -static -M `ls *.c` > .depend
+
+$(LIB): $(OBJS)
+	ar -rcs $(LIB) $(OBJS)
 
 -include .depend