Index: sg3_utils-1.28/lib/Makefile.am
===================================================================
--- sg3_utils-1.28.orig/lib/Makefile.am
+++ sg3_utils-1.28/lib/Makefile.am
@@ -1,8 +1,8 @@
 
 if OS_LINUX
 
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
 	sg_cmds_basic.c \
 	sg_cmds_extra.c \
@@ -10,9 +10,9 @@ libsgutils2_la_SOURCES = \
 	sg_pt_common.c \
 	sg_pt_linux.c \
 	sg_io_linux.c
 
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
 	sg_pt_freebsd.c \
 	sg_pt_osf1.c \
 	sg_pt_solaris.c \
 	sg_pt_win32.c \
@@ -22,18 +22,18 @@ endif
 
 
 if OS_WIN32_MINGW
 
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
 	sg_cmds_basic.c \
 	sg_cmds_extra.c \
 	sg_cmds_mmc.c \
 	sg_pt_common.c \
 	sg_pt_win32.c
 
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
 	sg_pt_linux.c \
 	sg_io_linux.c \
 	sg_pt_freebsd.c \
 	sg_pt_osf1.c \
@@ -44,18 +44,18 @@ endif
 
 
 if OS_WIN32_CYGWIN
 
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
 	sg_cmds_basic.c \
 	sg_cmds_extra.c \
 	sg_cmds_mmc.c \
 	sg_pt_common.c \
 	sg_pt_win32.c
 
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
 	sg_pt_linux.c \
 	sg_io_linux.c \
 	sg_pt_freebsd.c \
 	sg_pt_osf1.c \
@@ -66,18 +66,18 @@ endif
 
 
 if OS_FREEBSD
 
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
 	sg_cmds_basic.c \
 	sg_cmds_extra.c \
 	sg_cmds_mmc.c \
 	sg_pt_common.c \
 	sg_pt_freebsd.c
 
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
 	sg_pt_linux.c \
 	sg_io_linux.c \
 	sg_linux_inc.h \
 	sg_pt_osf1.c \
@@ -89,18 +89,18 @@ endif
 
 
 if OS_SOLARIS
 
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
 	sg_cmds_basic.c \
 	sg_cmds_extra.c \
 	sg_cmds_mmc.c \
 	sg_pt_common.c \
 	sg_pt_solaris.c
 
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
 	sg_pt_linux.c \
 	sg_io_linux.c \
 	sg_linux_inc.h \
 	sg_pt_freebsd.c \
@@ -112,18 +112,18 @@ endif
 
 
 if OS_OSF
 
-libsgutils2_la_SOURCES = \
+libsgutils_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
 	sg_cmds_basic.c \
 	sg_cmds_extra.c \
 	sg_cmds_mmc.c \
 	sg_pt_common.c \
 	sg_pt_osf1.c
 
-EXTRA_libsgutils2_la_SOURCES = \
+EXTRA_libsgutils_la_SOURCES = \
 	sg_pt_linux.c \
 	sg_io_linux.c \
 	sg_pt_freebsd.c \
 	sg_pt_solaris.c \
@@ -135,12 +135,12 @@ endif
 
 AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
 
-lib_LTLIBRARIES = libsgutils2.la
+lib_LTLIBRARIES = libsgutils.la
 
-libsgutils2_la_LDFLAGS = -version-info 2:0:0
+libsgutils_la_LDFLAGS = -version-info 1:0:0
 
-libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
-libsgutils2_la_DEPENDENCIES = @GETOPT_O_FILES@
+libsgutils_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
+libsgutils_la_DEPENDENCIES = @GETOPT_O_FILES@
 
 
Index: sg3_utils-1.28/lib/Makefile.in
===================================================================
--- sg3_utils-1.28.orig/lib/Makefile.in
+++ sg3_utils-1.28/lib/Makefile.in
@@ -49,59 +49,59 @@ am__vpath_adj = case $$p in \
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-am__libsgutils2_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \
+am__libsgutils_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \
 	sg_cmds_basic.c sg_cmds_extra.c sg_cmds_mmc.c sg_pt_common.c \
 	sg_pt_freebsd.c sg_pt_linux.c sg_io_linux.c sg_pt_osf1.c \
 	sg_pt_solaris.c sg_pt_win32.c
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@	sg_lib_data.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@	sg_cmds_basic.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@	sg_cmds_extra.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@	sg_cmds_mmc.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@	sg_pt_common.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_FALSE@@OS_WIN32_MINGW_TRUE@	sg_pt_win32.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@	sg_lib_data.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@	sg_cmds_basic.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@	sg_cmds_extra.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@	sg_cmds_mmc.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@	sg_pt_common.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_FALSE@@OS_WIN32_CYGWIN_TRUE@	sg_pt_win32.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@	sg_lib_data.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@	sg_cmds_basic.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@	sg_cmds_extra.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@	sg_cmds_mmc.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@	sg_pt_common.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_FALSE@@OS_SOLARIS_TRUE@	sg_pt_solaris.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@am_libsgutils2_la_OBJECTS =  \
+@OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@am_libsgutils_la_OBJECTS =  \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_lib.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_lib_data.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_cmds_basic.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_cmds_extra.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_cmds_mmc.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_pt_common.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_FALSE@@OS_OSF_TRUE@	sg_pt_osf1.lo
-@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@am_libsgutils2_la_OBJECTS =  \
+@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@am_libsgutils_la_OBJECTS =  \
 @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@	sg_lib.lo sg_lib_data.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@	sg_cmds_basic.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@	sg_cmds_extra.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@	sg_cmds_mmc.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@	sg_pt_common.lo \
 @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@	sg_pt_linux.lo sg_io_linux.lo
-@OS_FREEBSD_TRUE@am_libsgutils2_la_OBJECTS = sg_lib.lo sg_lib_data.lo \
+@OS_FREEBSD_TRUE@am_libsgutils_la_OBJECTS = sg_lib.lo sg_lib_data.lo \
 @OS_FREEBSD_TRUE@	sg_cmds_basic.lo sg_cmds_extra.lo \
 @OS_FREEBSD_TRUE@	sg_cmds_mmc.lo sg_pt_common.lo \
 @OS_FREEBSD_TRUE@	sg_pt_freebsd.lo
-am__EXTRA_libsgutils2_la_SOURCES_DIST = sg_pt_linux.c sg_io_linux.c \
+am__EXTRA_libsgutils_la_SOURCES_DIST = sg_pt_linux.c sg_io_linux.c \
 	sg_linux_inc.h sg_pt_osf1.c sg_pt_solaris.c sg_pt_win32.c \
 	getopt_long.c sg_pt_freebsd.c
-libsgutils2_la_OBJECTS = $(am_libsgutils2_la_OBJECTS)
-libsgutils2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+libsgutils_la_OBJECTS = $(am_libsgutils_la_OBJECTS)
+libsgutils_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libsgutils2_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(libsgutils_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -112,11 +112,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libsgutils2_la_SOURCES) $(EXTRA_libsgutils2_la_SOURCES)
-DIST_SOURCES = $(am__libsgutils2_la_SOURCES_DIST) \
-	$(am__EXTRA_libsgutils2_la_SOURCES_DIST)
+SOURCES = $(libsgutils_la_SOURCES) $(EXTRA_libsgutils_la_SOURCES)
+DIST_SOURCES = $(am__libsgutils_la_SOURCES_DIST) \
+	$(am__EXTRA_libsgutils_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -225,18 +225,18 @@ srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@OS_FREEBSD_TRUE@libsgutils2_la_SOURCES = \
+@OS_FREEBSD_TRUE@libsgutils_la_SOURCES = \
 @OS_FREEBSD_TRUE@	sg_lib.c \
 @OS_FREEBSD_TRUE@	sg_lib_data.c \
 @OS_FREEBSD_TRUE@	sg_cmds_basic.c \
 @OS_FREEBSD_TRUE@	sg_cmds_extra.c \
 @OS_FREEBSD_TRUE@	sg_cmds_mmc.c \
 @OS_FREEBSD_TRUE@	sg_pt_common.c \
 @OS_FREEBSD_TRUE@	sg_pt_freebsd.c
 
-@OS_LINUX_TRUE@libsgutils2_la_SOURCES = \
+@OS_LINUX_TRUE@libsgutils_la_SOURCES = \
 @OS_LINUX_TRUE@	sg_lib.c \
 @OS_LINUX_TRUE@	sg_lib_data.c \
 @OS_LINUX_TRUE@	sg_cmds_basic.c \
 @OS_LINUX_TRUE@	sg_cmds_extra.c \
@@ -244,86 +244,86 @@ top_srcdir = @top_srcdir@
 @OS_LINUX_TRUE@	sg_pt_common.c \
 @OS_LINUX_TRUE@	sg_pt_linux.c \
 @OS_LINUX_TRUE@	sg_io_linux.c
 
-@OS_OSF_TRUE@libsgutils2_la_SOURCES = \
+@OS_OSF_TRUE@libsgutils_la_SOURCES = \
 @OS_OSF_TRUE@	sg_lib.c \
 @OS_OSF_TRUE@	sg_lib_data.c \
 @OS_OSF_TRUE@	sg_cmds_basic.c \
 @OS_OSF_TRUE@	sg_cmds_extra.c \
 @OS_OSF_TRUE@	sg_cmds_mmc.c \
 @OS_OSF_TRUE@	sg_pt_common.c \
 @OS_OSF_TRUE@	sg_pt_osf1.c
 
-@OS_SOLARIS_TRUE@libsgutils2_la_SOURCES = \
+@OS_SOLARIS_TRUE@libsgutils_la_SOURCES = \
 @OS_SOLARIS_TRUE@	sg_lib.c \
 @OS_SOLARIS_TRUE@	sg_lib_data.c \
 @OS_SOLARIS_TRUE@	sg_cmds_basic.c \
 @OS_SOLARIS_TRUE@	sg_cmds_extra.c \
 @OS_SOLARIS_TRUE@	sg_cmds_mmc.c \
 @OS_SOLARIS_TRUE@	sg_pt_common.c \
 @OS_SOLARIS_TRUE@	sg_pt_solaris.c
 
-@OS_WIN32_CYGWIN_TRUE@libsgutils2_la_SOURCES = \
+@OS_WIN32_CYGWIN_TRUE@libsgutils_la_SOURCES = \
 @OS_WIN32_CYGWIN_TRUE@	sg_lib.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_lib_data.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_cmds_basic.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_cmds_extra.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_cmds_mmc.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_pt_common.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_pt_win32.c
 
-@OS_WIN32_MINGW_TRUE@libsgutils2_la_SOURCES = \
+@OS_WIN32_MINGW_TRUE@libsgutils_la_SOURCES = \
 @OS_WIN32_MINGW_TRUE@	sg_lib.c \
 @OS_WIN32_MINGW_TRUE@	sg_lib_data.c \
 @OS_WIN32_MINGW_TRUE@	sg_cmds_basic.c \
 @OS_WIN32_MINGW_TRUE@	sg_cmds_extra.c \
 @OS_WIN32_MINGW_TRUE@	sg_cmds_mmc.c \
 @OS_WIN32_MINGW_TRUE@	sg_pt_common.c \
 @OS_WIN32_MINGW_TRUE@	sg_pt_win32.c
 
-@OS_FREEBSD_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_FREEBSD_TRUE@EXTRA_libsgutils_la_SOURCES = \
 @OS_FREEBSD_TRUE@	sg_pt_linux.c \
 @OS_FREEBSD_TRUE@	sg_io_linux.c \
 @OS_FREEBSD_TRUE@	sg_linux_inc.h \
 @OS_FREEBSD_TRUE@	sg_pt_osf1.c \
 @OS_FREEBSD_TRUE@	sg_pt_solaris.c \
 @OS_FREEBSD_TRUE@	sg_pt_win32.c \
 @OS_FREEBSD_TRUE@	getopt_long.c
 
-@OS_LINUX_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_LINUX_TRUE@EXTRA_libsgutils_la_SOURCES = \
 @OS_LINUX_TRUE@	sg_pt_freebsd.c \
 @OS_LINUX_TRUE@	sg_pt_osf1.c \
 @OS_LINUX_TRUE@	sg_pt_solaris.c \
 @OS_LINUX_TRUE@	sg_pt_win32.c \
 @OS_LINUX_TRUE@	getopt_long.c
 
-@OS_OSF_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_OSF_TRUE@EXTRA_libsgutils_la_SOURCES = \
 @OS_OSF_TRUE@	sg_pt_linux.c \
 @OS_OSF_TRUE@	sg_io_linux.c \
 @OS_OSF_TRUE@	sg_pt_freebsd.c \
 @OS_OSF_TRUE@	sg_pt_solaris.c \
 @OS_OSF_TRUE@	sg_pt_win32.c \
 @OS_OSF_TRUE@	getopt_long.c
 
-@OS_SOLARIS_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_SOLARIS_TRUE@EXTRA_libsgutils_la_SOURCES = \
 @OS_SOLARIS_TRUE@	sg_pt_linux.c \
 @OS_SOLARIS_TRUE@	sg_io_linux.c \
 @OS_SOLARIS_TRUE@	sg_linux_inc.h \
 @OS_SOLARIS_TRUE@	sg_pt_freebsd.c \
 @OS_SOLARIS_TRUE@	sg_pt_osf1.c \
 @OS_SOLARIS_TRUE@	sg_pt_win32.c \
 @OS_SOLARIS_TRUE@	getopt_long.c
 
-@OS_WIN32_CYGWIN_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_WIN32_CYGWIN_TRUE@EXTRA_libsgutils_la_SOURCES = \
 @OS_WIN32_CYGWIN_TRUE@	sg_pt_linux.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_io_linux.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_pt_freebsd.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_pt_osf1.c \
 @OS_WIN32_CYGWIN_TRUE@	sg_pt_solaris.c \
 @OS_WIN32_CYGWIN_TRUE@	getopt_long.c
 
-@OS_WIN32_MINGW_TRUE@EXTRA_libsgutils2_la_SOURCES = \
+@OS_WIN32_MINGW_TRUE@EXTRA_libsgutils_la_SOURCES = \
 @OS_WIN32_MINGW_TRUE@	sg_pt_linux.c \
 @OS_WIN32_MINGW_TRUE@	sg_io_linux.c \
 @OS_WIN32_MINGW_TRUE@	sg_pt_freebsd.c \
 @OS_WIN32_MINGW_TRUE@	sg_pt_osf1.c \
@@ -331,12 +331,12 @@ top_srcdir = @top_srcdir@
 @OS_WIN32_MINGW_TRUE@	getopt_long.c
 
 AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
-lib_LTLIBRARIES = libsgutils2.la
-libsgutils2_la_LDFLAGS = -version-info 2:0:0
-libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
-libsgutils2_la_DEPENDENCIES = @GETOPT_O_FILES@
+lib_LTLIBRARIES = libsgutils.la
+libsgutils_la_LDFLAGS = -version-info 1:0:0
+libsgutils_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
+libsgutils_la_DEPENDENCIES = @GETOPT_O_FILES@
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -395,10 +395,10 @@ clean-libLTLIBRARIES:
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libsgutils2.la: $(libsgutils2_la_OBJECTS) $(libsgutils2_la_DEPENDENCIES) 
-	$(libsgutils2_la_LINK) -rpath $(libdir) $(libsgutils2_la_OBJECTS) $(libsgutils2_la_LIBADD) $(LIBS)
+libsgutils.la: $(libsgutils_la_OBJECTS) $(libsgutils_la_DEPENDENCIES)
+	$(libsgutils_la_LINK) -rpath $(libdir) $(libsgutils_la_OBJECTS) $(libsgutils_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
Index: sg3_utils-1.28/src/Makefile.am
===================================================================
--- sg3_utils-1.28.orig/src/Makefile.am
+++ sg3_utils-1.28/src/Makefile.am
@@ -122,153 +122,153 @@ endif
 AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
 
 sg_dd_SOURCES =	sg_dd.c
-sg_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_dd_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_emc_trespass_SOURCES = sg_emc_trespass.c
-sg_emc_trespass_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_emc_trespass_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_format_SOURCES = sg_format.c
-sg_format_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_format_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_get_config_SOURCES = sg_get_config.c
-sg_get_config_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_get_config_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_get_lba_status_SOURCES = sg_get_lba_status.c
-sg_get_lba_status_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_get_lba_status_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_ident_SOURCES = sg_ident.c
-sg_ident_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ident_LDADD = ../lib/libsgutils.la @os_libs@
 
 sginfo_SOURCES = sginfo.c
-sginfo_LDADD = ../lib/libsgutils2.la @os_libs@
+sginfo_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_inq_SOURCES = sg_inq.c sg_inq_data.c
-sg_inq_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_inq_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_logs_SOURCES = sg_logs.c
-sg_logs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_logs_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_luns_SOURCES = sg_luns.c
-sg_luns_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_luns_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_map26_SOURCES = sg_map26.c
 sg_map26_LDADD = @os_libs@
 
 sg_map_SOURCES = sg_map.c
-sg_map_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_map_LDADD = ../lib/libsgutils.la @os_libs@
 
 sgm_dd_SOURCES = sgm_dd.c
-sgm_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sgm_dd_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_modes_SOURCES = sg_modes.c
-sg_modes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_modes_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_opcodes_SOURCES = sg_opcodes.c
-sg_opcodes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_opcodes_LDADD = ../lib/libsgutils.la @os_libs@
 
 sgp_dd_SOURCES = sgp_dd.c
-sgp_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -lpthread
+sgp_dd_LDADD = ../lib/libsgutils.la @os_libs@ -lpthread
 
 sg_persist_SOURCES = sg_persist.c
-sg_persist_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_persist_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_prevent_SOURCES = sg_prevent.c
-sg_prevent_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_prevent_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_raw_SOURCES = sg_raw.c
-sg_raw_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_raw_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_rbuf_SOURCES = sg_rbuf.c
-sg_rbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rbuf_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_rdac_SOURCES = sg_rdac.c
-sg_rdac_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rdac_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_read_SOURCES = sg_read.c
-sg_read_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_readcap_SOURCES = sg_readcap.c
-sg_readcap_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_readcap_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_read_block_limits_SOURCES = sg_read_block_limits.c
-sg_read_block_limits_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_block_limits_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_read_buffer_SOURCES = sg_read_buffer.c
-sg_read_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_buffer_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_read_long_SOURCES = sg_read_long.c
-sg_read_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_long_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_reassign_SOURCES = sg_reassign.c
-sg_reassign_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_reassign_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_requests_SOURCES = sg_requests.c
-sg_requests_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_requests_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_reset_SOURCES = sg_reset.c
 sg_reset_LDADD = @os_libs@
 
 sg_rmsn_SOURCES = sg_rmsn.c
-sg_rmsn_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rmsn_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_rtpg_SOURCES = sg_rtpg.c
-sg_rtpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rtpg_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_safte_SOURCES = sg_safte.c
-sg_safte_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_safte_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_sat_identify_SOURCES = sg_sat_identify.c
-sg_sat_identify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_identify_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_sat_phy_event_SOURCES = sg_sat_phy_event.c
-sg_sat_phy_event_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_phy_event_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_sat_set_features_SOURCES = sg_sat_set_features.c
-sg_sat_set_features_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_set_features_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_scan_SOURCES = sg_scan.c
-sg_scan_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_scan_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_senddiag_SOURCES = sg_senddiag.c
-sg_senddiag_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_senddiag_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_ses_SOURCES = sg_ses.c
-sg_ses_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ses_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_start_SOURCES = sg_start.c
-sg_start_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_start_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_stpg_SOURCES = sg_stpg.c
-sg_stpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_stpg_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_sync_SOURCES = sg_sync.c
-sg_sync_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sync_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_test_rwbuf_SOURCES = sg_test_rwbuf.c
-sg_test_rwbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_test_rwbuf_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_turs_SOURCES = sg_turs.c
-sg_turs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_turs_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_unmap_SOURCES = sg_unmap.c
-sg_unmap_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_unmap_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_verify_SOURCES = sg_verify.c
-sg_verify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_verify_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_vpd_SOURCES = sg_vpd.c sg_vpd_vendor.c
-sg_vpd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_vpd_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_write_buffer_SOURCES = sg_write_buffer.c
-sg_write_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_buffer_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_write_long_SOURCES = sg_write_long.c
-sg_write_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_long_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_write_same_SOURCES = sg_write_same.c
-sg_write_same_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_same_LDADD = ../lib/libsgutils.la @os_libs@
 
 sg_wr_mode_SOURCES = sg_wr_mode.c
-sg_wr_mode_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_wr_mode_LDADD = ../lib/libsgutils.la @os_libs@
 
Index: sg3_utils-1.28/src/Makefile.in
===================================================================
--- sg3_utils-1.28.orig/src/Makefile.in
+++ sg3_utils-1.28/src/Makefile.in
@@ -271,156 +271,156 @@ am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_sg_dd_OBJECTS = sg_dd.$(OBJEXT)
 sg_dd_OBJECTS = $(am_sg_dd_OBJECTS)
-sg_dd_DEPENDENCIES = ../lib/libsgutils2.la
+sg_dd_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_emc_trespass_OBJECTS = sg_emc_trespass.$(OBJEXT)
 sg_emc_trespass_OBJECTS = $(am_sg_emc_trespass_OBJECTS)
-sg_emc_trespass_DEPENDENCIES = ../lib/libsgutils2.la
+sg_emc_trespass_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_format_OBJECTS = sg_format.$(OBJEXT)
 sg_format_OBJECTS = $(am_sg_format_OBJECTS)
-sg_format_DEPENDENCIES = ../lib/libsgutils2.la
+sg_format_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_get_config_OBJECTS = sg_get_config.$(OBJEXT)
 sg_get_config_OBJECTS = $(am_sg_get_config_OBJECTS)
-sg_get_config_DEPENDENCIES = ../lib/libsgutils2.la
+sg_get_config_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_get_lba_status_OBJECTS = sg_get_lba_status.$(OBJEXT)
 sg_get_lba_status_OBJECTS = $(am_sg_get_lba_status_OBJECTS)
-sg_get_lba_status_DEPENDENCIES = ../lib/libsgutils2.la
+sg_get_lba_status_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_ident_OBJECTS = sg_ident.$(OBJEXT)
 sg_ident_OBJECTS = $(am_sg_ident_OBJECTS)
-sg_ident_DEPENDENCIES = ../lib/libsgutils2.la
+sg_ident_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_inq_OBJECTS = sg_inq.$(OBJEXT) sg_inq_data.$(OBJEXT)
 sg_inq_OBJECTS = $(am_sg_inq_OBJECTS)
-sg_inq_DEPENDENCIES = ../lib/libsgutils2.la
+sg_inq_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_logs_OBJECTS = sg_logs.$(OBJEXT)
 sg_logs_OBJECTS = $(am_sg_logs_OBJECTS)
-sg_logs_DEPENDENCIES = ../lib/libsgutils2.la
+sg_logs_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_luns_OBJECTS = sg_luns.$(OBJEXT)
 sg_luns_OBJECTS = $(am_sg_luns_OBJECTS)
-sg_luns_DEPENDENCIES = ../lib/libsgutils2.la
+sg_luns_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_map_OBJECTS = sg_map.$(OBJEXT)
 sg_map_OBJECTS = $(am_sg_map_OBJECTS)
-sg_map_DEPENDENCIES = ../lib/libsgutils2.la
+sg_map_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_map26_OBJECTS = sg_map26.$(OBJEXT)
 sg_map26_OBJECTS = $(am_sg_map26_OBJECTS)
 sg_map26_DEPENDENCIES =
 am_sg_modes_OBJECTS = sg_modes.$(OBJEXT)
 sg_modes_OBJECTS = $(am_sg_modes_OBJECTS)
-sg_modes_DEPENDENCIES = ../lib/libsgutils2.la
+sg_modes_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_opcodes_OBJECTS = sg_opcodes.$(OBJEXT)
 sg_opcodes_OBJECTS = $(am_sg_opcodes_OBJECTS)
-sg_opcodes_DEPENDENCIES = ../lib/libsgutils2.la
+sg_opcodes_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_persist_OBJECTS = sg_persist.$(OBJEXT)
 sg_persist_OBJECTS = $(am_sg_persist_OBJECTS)
-sg_persist_DEPENDENCIES = ../lib/libsgutils2.la
+sg_persist_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_prevent_OBJECTS = sg_prevent.$(OBJEXT)
 sg_prevent_OBJECTS = $(am_sg_prevent_OBJECTS)
-sg_prevent_DEPENDENCIES = ../lib/libsgutils2.la
+sg_prevent_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_raw_OBJECTS = sg_raw.$(OBJEXT)
 sg_raw_OBJECTS = $(am_sg_raw_OBJECTS)
-sg_raw_DEPENDENCIES = ../lib/libsgutils2.la
+sg_raw_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_rbuf_OBJECTS = sg_rbuf.$(OBJEXT)
 sg_rbuf_OBJECTS = $(am_sg_rbuf_OBJECTS)
-sg_rbuf_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rbuf_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_rdac_OBJECTS = sg_rdac.$(OBJEXT)
 sg_rdac_OBJECTS = $(am_sg_rdac_OBJECTS)
-sg_rdac_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rdac_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_read_OBJECTS = sg_read.$(OBJEXT)
 sg_read_OBJECTS = $(am_sg_read_OBJECTS)
-sg_read_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_read_block_limits_OBJECTS = sg_read_block_limits.$(OBJEXT)
 sg_read_block_limits_OBJECTS = $(am_sg_read_block_limits_OBJECTS)
-sg_read_block_limits_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_block_limits_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_read_buffer_OBJECTS = sg_read_buffer.$(OBJEXT)
 sg_read_buffer_OBJECTS = $(am_sg_read_buffer_OBJECTS)
-sg_read_buffer_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_buffer_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_read_long_OBJECTS = sg_read_long.$(OBJEXT)
 sg_read_long_OBJECTS = $(am_sg_read_long_OBJECTS)
-sg_read_long_DEPENDENCIES = ../lib/libsgutils2.la
+sg_read_long_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_readcap_OBJECTS = sg_readcap.$(OBJEXT)
 sg_readcap_OBJECTS = $(am_sg_readcap_OBJECTS)
-sg_readcap_DEPENDENCIES = ../lib/libsgutils2.la
+sg_readcap_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_reassign_OBJECTS = sg_reassign.$(OBJEXT)
 sg_reassign_OBJECTS = $(am_sg_reassign_OBJECTS)
-sg_reassign_DEPENDENCIES = ../lib/libsgutils2.la
+sg_reassign_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_requests_OBJECTS = sg_requests.$(OBJEXT)
 sg_requests_OBJECTS = $(am_sg_requests_OBJECTS)
-sg_requests_DEPENDENCIES = ../lib/libsgutils2.la
+sg_requests_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_reset_OBJECTS = sg_reset.$(OBJEXT)
 sg_reset_OBJECTS = $(am_sg_reset_OBJECTS)
 sg_reset_DEPENDENCIES =
 am_sg_rmsn_OBJECTS = sg_rmsn.$(OBJEXT)
 sg_rmsn_OBJECTS = $(am_sg_rmsn_OBJECTS)
-sg_rmsn_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rmsn_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_rtpg_OBJECTS = sg_rtpg.$(OBJEXT)
 sg_rtpg_OBJECTS = $(am_sg_rtpg_OBJECTS)
-sg_rtpg_DEPENDENCIES = ../lib/libsgutils2.la
+sg_rtpg_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_safte_OBJECTS = sg_safte.$(OBJEXT)
 sg_safte_OBJECTS = $(am_sg_safte_OBJECTS)
-sg_safte_DEPENDENCIES = ../lib/libsgutils2.la
+sg_safte_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_sat_identify_OBJECTS = sg_sat_identify.$(OBJEXT)
 sg_sat_identify_OBJECTS = $(am_sg_sat_identify_OBJECTS)
-sg_sat_identify_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sat_identify_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_sat_phy_event_OBJECTS = sg_sat_phy_event.$(OBJEXT)
 sg_sat_phy_event_OBJECTS = $(am_sg_sat_phy_event_OBJECTS)
-sg_sat_phy_event_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sat_phy_event_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_sat_set_features_OBJECTS = sg_sat_set_features.$(OBJEXT)
 sg_sat_set_features_OBJECTS = $(am_sg_sat_set_features_OBJECTS)
-sg_sat_set_features_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sat_set_features_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_scan_OBJECTS = sg_scan.$(OBJEXT)
 sg_scan_OBJECTS = $(am_sg_scan_OBJECTS)
-sg_scan_DEPENDENCIES = ../lib/libsgutils2.la
+sg_scan_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_senddiag_OBJECTS = sg_senddiag.$(OBJEXT)
 sg_senddiag_OBJECTS = $(am_sg_senddiag_OBJECTS)
-sg_senddiag_DEPENDENCIES = ../lib/libsgutils2.la
+sg_senddiag_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_ses_OBJECTS = sg_ses.$(OBJEXT)
 sg_ses_OBJECTS = $(am_sg_ses_OBJECTS)
-sg_ses_DEPENDENCIES = ../lib/libsgutils2.la
+sg_ses_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_start_OBJECTS = sg_start.$(OBJEXT)
 sg_start_OBJECTS = $(am_sg_start_OBJECTS)
-sg_start_DEPENDENCIES = ../lib/libsgutils2.la
+sg_start_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_stpg_OBJECTS = sg_stpg.$(OBJEXT)
 sg_stpg_OBJECTS = $(am_sg_stpg_OBJECTS)
-sg_stpg_DEPENDENCIES = ../lib/libsgutils2.la
+sg_stpg_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_sync_OBJECTS = sg_sync.$(OBJEXT)
 sg_sync_OBJECTS = $(am_sg_sync_OBJECTS)
-sg_sync_DEPENDENCIES = ../lib/libsgutils2.la
+sg_sync_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_test_rwbuf_OBJECTS = sg_test_rwbuf.$(OBJEXT)
 sg_test_rwbuf_OBJECTS = $(am_sg_test_rwbuf_OBJECTS)
-sg_test_rwbuf_DEPENDENCIES = ../lib/libsgutils2.la
+sg_test_rwbuf_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_turs_OBJECTS = sg_turs.$(OBJEXT)
 sg_turs_OBJECTS = $(am_sg_turs_OBJECTS)
-sg_turs_DEPENDENCIES = ../lib/libsgutils2.la
+sg_turs_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_unmap_OBJECTS = sg_unmap.$(OBJEXT)
 sg_unmap_OBJECTS = $(am_sg_unmap_OBJECTS)
-sg_unmap_DEPENDENCIES = ../lib/libsgutils2.la
+sg_unmap_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_verify_OBJECTS = sg_verify.$(OBJEXT)
 sg_verify_OBJECTS = $(am_sg_verify_OBJECTS)
-sg_verify_DEPENDENCIES = ../lib/libsgutils2.la
+sg_verify_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_vpd_OBJECTS = sg_vpd.$(OBJEXT) sg_vpd_vendor.$(OBJEXT)
 sg_vpd_OBJECTS = $(am_sg_vpd_OBJECTS)
-sg_vpd_DEPENDENCIES = ../lib/libsgutils2.la
+sg_vpd_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_wr_mode_OBJECTS = sg_wr_mode.$(OBJEXT)
 sg_wr_mode_OBJECTS = $(am_sg_wr_mode_OBJECTS)
-sg_wr_mode_DEPENDENCIES = ../lib/libsgutils2.la
+sg_wr_mode_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_write_buffer_OBJECTS = sg_write_buffer.$(OBJEXT)
 sg_write_buffer_OBJECTS = $(am_sg_write_buffer_OBJECTS)
-sg_write_buffer_DEPENDENCIES = ../lib/libsgutils2.la
+sg_write_buffer_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_write_long_OBJECTS = sg_write_long.$(OBJEXT)
 sg_write_long_OBJECTS = $(am_sg_write_long_OBJECTS)
-sg_write_long_DEPENDENCIES = ../lib/libsgutils2.la
+sg_write_long_DEPENDENCIES = ../lib/libsgutils.la
 am_sg_write_same_OBJECTS = sg_write_same.$(OBJEXT)
 sg_write_same_OBJECTS = $(am_sg_write_same_OBJECTS)
-sg_write_same_DEPENDENCIES = ../lib/libsgutils2.la
+sg_write_same_DEPENDENCIES = ../lib/libsgutils.la
 am_sginfo_OBJECTS = sginfo.$(OBJEXT)
 sginfo_OBJECTS = $(am_sginfo_OBJECTS)
-sginfo_DEPENDENCIES = ../lib/libsgutils2.la
+sginfo_DEPENDENCIES = ../lib/libsgutils.la
 am_sgm_dd_OBJECTS = sgm_dd.$(OBJEXT)
 sgm_dd_OBJECTS = $(am_sgm_dd_OBJECTS)
-sgm_dd_DEPENDENCIES = ../lib/libsgutils2.la
+sgm_dd_DEPENDENCIES = ../lib/libsgutils.la
 am_sgp_dd_OBJECTS = sgp_dd.$(OBJEXT)
 sgp_dd_OBJECTS = $(am_sgp_dd_OBJECTS)
-sgp_dd_DEPENDENCIES = ../lib/libsgutils2.la
+sgp_dd_DEPENDENCIES = ../lib/libsgutils.la
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -586,107 +586,107 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W
 # AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99
 sg_dd_SOURCES = sg_dd.c
-sg_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_dd_LDADD = ../lib/libsgutils.la @os_libs@
 sg_emc_trespass_SOURCES = sg_emc_trespass.c
-sg_emc_trespass_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_emc_trespass_LDADD = ../lib/libsgutils.la @os_libs@
 sg_format_SOURCES = sg_format.c
-sg_format_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_format_LDADD = ../lib/libsgutils.la @os_libs@
 sg_get_config_SOURCES = sg_get_config.c
-sg_get_config_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_get_config_LDADD = ../lib/libsgutils.la @os_libs@
 sg_get_lba_status_SOURCES = sg_get_lba_status.c
-sg_get_lba_status_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_get_lba_status_LDADD = ../lib/libsgutils.la @os_libs@
 sg_ident_SOURCES = sg_ident.c
-sg_ident_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ident_LDADD = ../lib/libsgutils.la @os_libs@
 sginfo_SOURCES = sginfo.c
-sginfo_LDADD = ../lib/libsgutils2.la @os_libs@
+sginfo_LDADD = ../lib/libsgutils.la @os_libs@
 sg_inq_SOURCES = sg_inq.c sg_inq_data.c
-sg_inq_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_inq_LDADD = ../lib/libsgutils.la @os_libs@
 sg_logs_SOURCES = sg_logs.c
-sg_logs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_logs_LDADD = ../lib/libsgutils.la @os_libs@
 sg_luns_SOURCES = sg_luns.c
-sg_luns_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_luns_LDADD = ../lib/libsgutils.la @os_libs@
 sg_map26_SOURCES = sg_map26.c
 sg_map26_LDADD = @os_libs@
 sg_map_SOURCES = sg_map.c
-sg_map_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_map_LDADD = ../lib/libsgutils.la @os_libs@
 sgm_dd_SOURCES = sgm_dd.c
-sgm_dd_LDADD = ../lib/libsgutils2.la @os_libs@
+sgm_dd_LDADD = ../lib/libsgutils.la @os_libs@
 sg_modes_SOURCES = sg_modes.c
-sg_modes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_modes_LDADD = ../lib/libsgutils.la @os_libs@
 sg_opcodes_SOURCES = sg_opcodes.c
-sg_opcodes_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_opcodes_LDADD = ../lib/libsgutils.la @os_libs@
 sgp_dd_SOURCES = sgp_dd.c
-sgp_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -lpthread
+sgp_dd_LDADD = ../lib/libsgutils.la @os_libs@ -lpthread
 sg_persist_SOURCES = sg_persist.c
-sg_persist_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_persist_LDADD = ../lib/libsgutils.la @os_libs@
 sg_prevent_SOURCES = sg_prevent.c
-sg_prevent_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_prevent_LDADD = ../lib/libsgutils.la @os_libs@
 sg_raw_SOURCES = sg_raw.c
-sg_raw_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_raw_LDADD = ../lib/libsgutils.la @os_libs@
 sg_rbuf_SOURCES = sg_rbuf.c
-sg_rbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rbuf_LDADD = ../lib/libsgutils.la @os_libs@
 sg_rdac_SOURCES = sg_rdac.c
-sg_rdac_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rdac_LDADD = ../lib/libsgutils.la @os_libs@
 sg_read_SOURCES = sg_read.c
-sg_read_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_LDADD = ../lib/libsgutils.la @os_libs@
 sg_readcap_SOURCES = sg_readcap.c
-sg_readcap_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_readcap_LDADD = ../lib/libsgutils.la @os_libs@
 sg_read_block_limits_SOURCES = sg_read_block_limits.c
-sg_read_block_limits_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_block_limits_LDADD = ../lib/libsgutils.la @os_libs@
 sg_read_buffer_SOURCES = sg_read_buffer.c
-sg_read_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_buffer_LDADD = ../lib/libsgutils.la @os_libs@
 sg_read_long_SOURCES = sg_read_long.c
-sg_read_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_read_long_LDADD = ../lib/libsgutils.la @os_libs@
 sg_reassign_SOURCES = sg_reassign.c
-sg_reassign_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_reassign_LDADD = ../lib/libsgutils.la @os_libs@
 sg_requests_SOURCES = sg_requests.c
-sg_requests_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_requests_LDADD = ../lib/libsgutils.la @os_libs@
 sg_reset_SOURCES = sg_reset.c
 sg_reset_LDADD = @os_libs@
 sg_rmsn_SOURCES = sg_rmsn.c
-sg_rmsn_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rmsn_LDADD = ../lib/libsgutils.la @os_libs@
 sg_rtpg_SOURCES = sg_rtpg.c
-sg_rtpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_rtpg_LDADD = ../lib/libsgutils.la @os_libs@
 sg_safte_SOURCES = sg_safte.c
-sg_safte_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_safte_LDADD = ../lib/libsgutils.la @os_libs@
 sg_sat_identify_SOURCES = sg_sat_identify.c
-sg_sat_identify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_identify_LDADD = ../lib/libsgutils.la @os_libs@
 sg_sat_phy_event_SOURCES = sg_sat_phy_event.c
-sg_sat_phy_event_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_phy_event_LDADD = ../lib/libsgutils.la @os_libs@
 sg_sat_set_features_SOURCES = sg_sat_set_features.c
-sg_sat_set_features_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sat_set_features_LDADD = ../lib/libsgutils.la @os_libs@
 sg_scan_SOURCES = sg_scan.c
-sg_scan_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_scan_LDADD = ../lib/libsgutils.la @os_libs@
 sg_senddiag_SOURCES = sg_senddiag.c
-sg_senddiag_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_senddiag_LDADD = ../lib/libsgutils.la @os_libs@
 sg_ses_SOURCES = sg_ses.c
-sg_ses_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_ses_LDADD = ../lib/libsgutils.la @os_libs@
 sg_start_SOURCES = sg_start.c
-sg_start_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_start_LDADD = ../lib/libsgutils.la @os_libs@
 sg_stpg_SOURCES = sg_stpg.c
-sg_stpg_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_stpg_LDADD = ../lib/libsgutils.la @os_libs@
 sg_sync_SOURCES = sg_sync.c
-sg_sync_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_sync_LDADD = ../lib/libsgutils.la @os_libs@
 sg_test_rwbuf_SOURCES = sg_test_rwbuf.c
-sg_test_rwbuf_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_test_rwbuf_LDADD = ../lib/libsgutils.la @os_libs@
 sg_turs_SOURCES = sg_turs.c
-sg_turs_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_turs_LDADD = ../lib/libsgutils.la @os_libs@
 sg_unmap_SOURCES = sg_unmap.c
-sg_unmap_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_unmap_LDADD = ../lib/libsgutils.la @os_libs@
 sg_verify_SOURCES = sg_verify.c
-sg_verify_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_verify_LDADD = ../lib/libsgutils.la @os_libs@
 sg_vpd_SOURCES = sg_vpd.c sg_vpd_vendor.c
-sg_vpd_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_vpd_LDADD = ../lib/libsgutils.la @os_libs@
 sg_write_buffer_SOURCES = sg_write_buffer.c
-sg_write_buffer_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_buffer_LDADD = ../lib/libsgutils.la @os_libs@
 sg_write_long_SOURCES = sg_write_long.c
-sg_write_long_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_long_LDADD = ../lib/libsgutils.la @os_libs@
 sg_write_same_SOURCES = sg_write_same.c
-sg_write_same_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_write_same_LDADD = ../lib/libsgutils.la @os_libs@
 sg_wr_mode_SOURCES = sg_wr_mode.c
-sg_wr_mode_LDADD = ../lib/libsgutils2.la @os_libs@
+sg_wr_mode_LDADD = ../lib/libsgutils.la @os_libs@
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
