Revert "Rename libiscsi to libiscsiclient to avoid clash with obscure linux library"

We dont need to change name anymore so witch back to original libiscsi name

This reverts commit c4386dfb87.

Makefile.am

@@ -4,10 +4,10 @@ ACLOCAL_AMFLAGS =-I m4
 AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))"
 AM_CFLAGS=$(WARN_CFLAGS)
-LDADD = lib/libiscsiclient.la -lpopt
+LDADD = lib/libiscsi.la -lpopt
 
 EXTRA_DIST = autogen.sh COPYING.LESSER \
-	     packaging/RPM/libiscsiclient.spec.in packaging/RPM/makerpms.sh
+	     packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh
 
 # Simplify conditions below by declaring variables as empty
 
@@ -15,24 +15,24 @@ bin_PROGRAMS =
 noinst_PROGRAMS =
 EXTRA_PROGRAMS =
 
-# libiscsiclient shared library
+# libiscsi shared library
 
 iscsi_includedir = $(includedir)/iscsi
 dist_iscsi_include_HEADERS = include/iscsi.h include/scsi-lowlevel.h
 dist_noinst_HEADERS = include/iscsi-private.h include/md5.h include/slist.h
 
-lib_LTLIBRARIES = lib/libiscsiclient.la
-lib_libiscsiclient_la_SOURCES = \
+lib_LTLIBRARIES = lib/libiscsi.la
+lib_libiscsi_la_SOURCES = \
 	lib/connect.c lib/crc32c.c lib/discovery.c lib/init.c \
 	lib/login.c lib/md5.c lib/nop.c lib/pdu.c lib/scsi-command.c \
 	lib/scsi-lowlevel.c lib/socket.c lib/sync.c lib/task_mgmt.c
 
 SONAME=$(firstword $(subst ., ,$(VERSION)))
 SOREL=$(shell printf "%d%02d%02d" $(subst ., ,$(VERSION)))
-lib_libiscsiclient_la_LDFLAGS = \
+lib_libiscsi_la_LDFLAGS = \
 	-version-info $(SONAME):$(SOREL):0 -bindir $(bindir) -no-undefined
 
-# libiscsiclient utilities
+# libiscsi utilities
 
 if PROGRAMS
 bin_PROGRAMS += bin/iscsi-inq bin/iscsi-ls
@@ -47,7 +47,7 @@ bin_iscsiclient_SOURCES = examples/iscsiclient.c
 EXTRA_PROGRAMS += bin/iscsi-dd
 bin_iscsi_dd_SOURCES = examples/iscsi-dd.c
 
-# libiscsiclient test tool
+# libiscsi test tool
 
 noinst_PROGRAMS += bin/iscsi-test
 dist_noinst_HEADERS += test-tool/iscsi-test.h
@@ -78,9 +78,9 @@ bin_ld_iscsi_SOURCES = src/ld_iscsi.c
 bin_ld_iscsi_CFLAGS = $(AM_CFLAGS) -fPIC
 
 # 2) let libtool link in the static version of the library
-noinst_LTLIBRARIES = lib/libiscsiclient_convenience.la
-lib_libiscsiclient_convenience_la_SOURCES = $(lib_libiscsiclient_la_SOURCES)
-bin/ld_iscsi.o: src/bin_ld_iscsi-ld_iscsi.o lib/libiscsiclient_convenience.la
+noinst_LTLIBRARIES = lib/libiscsi_convenience.la
+lib_libiscsi_convenience_la_SOURCES = $(lib_libiscsi_la_SOURCES)
+bin/ld_iscsi.o: src/bin_ld_iscsi-ld_iscsi.o lib/libiscsi_convenience.la
 	$(LIBTOOL) --mode=link $(CC) -o $@ $^
 
 # 3) Manually create the .so file.