sg_inq: fix referrals VPD page; start Makefile.am cleanup

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@499 6180dd3e-e324-4e3e-922d-17de1ae2f315

9 files changed, 60 insertions, 407 deletions

diff --git a/ChangeLog b/ChangeLog
index 6254e59f..97d1d745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,10 @@ Each utility has its own version number, date of last change and
 some description at the top of its ".c" file. All utilities in the main
 directory have their own "man" pages. There is also a sg3_utils man page.
 
-Changelog for sg3_utils-1.37 [20130604] [svn: r498]
+Changelog for sg3_utils-1.37 [20130614] [svn: r499]
   - sg_compare_and_write: fix wrprotect setting
+  - sg_inq: fix referrals VPD page
+  - Makefile.am cleanup
 
 Changelog for sg3_utils-1.36 [20130531] [svn: r497]
   - sg_vpd: Protocol-specific port information VPD page
diff --git a/README b/README
index bcca1ced..5e9f4ba8 100644
--- a/README
+++ b/README
@@ -376,4 +376,4 @@ See http://sg.danny.cz/sg/tools.html
 
 
 Douglas Gilbert
-31st May 2013
+14th June 2013
diff --git a/debian/changelog b/debian/changelog
index 63357d47..7af5c189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ sg3-utils (1.37-0.1) unstable; urgency=low
 
   * New upstream version
 
- -- Douglas Gilbert <dgilbert@interlog.com>  Mon, 03 Jun 2013 16:00:00 -0400
+ -- Douglas Gilbert <dgilbert@interlog.com>  Fri, 14 Jun 2013 02:00:00 +0200
 
 sg3-utils (1.36-0.1) unstable; urgency=low
 
diff --git a/include/Makefile.am b/include/Makefile.am
index c0cf895c..ba921855 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,9 +1,6 @@
 
 scsiincludedir      = $(includedir)/scsi
 
-
-if OS_LINUX
-
 scsiinclude_HEADERS = \
 	sg_lib.h \
 	sg_lib_data.h \
@@ -11,107 +8,51 @@ scsiinclude_HEADERS = \
 	sg_cmds_basic.h \
 	sg_cmds_extra.h \
 	sg_cmds_mmc.h \
-	sg_pt.h \
+	sg_pt.h
+
+if OS_LINUX
+scsiinclude_HEADERS += \
 	sg_linux_inc.h \
 	sg_io_linux.h
 	
 noinst_HEADERS = \
 	sg_pt_win32.h
-
 endif
 
-
 if OS_WIN32_MINGW
-
-scsiinclude_HEADERS = \
-	sg_lib.h \
-	sg_lib_data.h \
-	sg_cmds.h \
-	sg_cmds_basic.h \
-	sg_cmds_extra.h \
-	sg_cmds_mmc.h \
-	sg_pt.h \
-	sg_pt_win32.h
+scsiinclude_HEADERS += sg_pt_win32.h
 	
 noinst_HEADERS = \
 	sg_linux_inc.h \
 	sg_io_linux.h
-
 endif
 
-
 if OS_WIN32_CYGWIN
-
-scsiinclude_HEADERS = \
-	sg_lib.h \
-	sg_lib_data.h \
-	sg_cmds.h \
-	sg_cmds_basic.h \
-	sg_cmds_extra.h \
-	sg_cmds_mmc.h \
-	sg_pt.h \
-	sg_pt_win32.h
+scsiinclude_HEADERS += sg_pt_win32.h
 	
 noinst_HEADERS = \
 	sg_linux_inc.h \
 	sg_io_linux.h
-
 endif
 
-
 if OS_FREEBSD
-
-scsiinclude_HEADERS = \
-	sg_lib.h \
-	sg_lib_data.h \
-	sg_cmds.h \
-	sg_cmds_basic.h \
-	sg_cmds_extra.h \
-	sg_cmds_mmc.h \
-	sg_pt.h
-	
 noinst_HEADERS = \
 	sg_linux_inc.h \
 	sg_io_linux.h \
 	sg_pt_win32.h
-
 endif
 
-
 if OS_SOLARIS
-
-scsiinclude_HEADERS = \
-	sg_lib.h \
-	sg_lib_data.h \
-	sg_cmds.h \
-	sg_cmds_basic.h \
-	sg_cmds_extra.h \
-	sg_cmds_mmc.h \
-	sg_pt.h
-	
 noinst_HEADERS = \
 	sg_linux_inc.h \
 	sg_io_linux.h \
 	sg_pt_win32.h
-
 endif
 
-
 if OS_OSF
-
-scsiinclude_HEADERS = \
-	sg_lib.h \
-	sg_lib_data.h \
-	sg_cmds.h \
-	sg_cmds_basic.h \
-	sg_cmds_extra.h \
-	sg_cmds_mmc.h \
-	sg_pt.h
-	
 noinst_HEADERS = \
 	sg_linux_inc.h \
 	sg_io_linux.h \
 	sg_pt_win32.h
-
 endif
 
diff --git a/include/Makefile.in b/include/Makefile.in
index cb0d26ca..d00e243b 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -51,6 +51,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@OS_LINUX_TRUE@am__append_1 = \
+@OS_LINUX_TRUE@	sg_linux_inc.h \
+@OS_LINUX_TRUE@	sg_io_linux.h
+
+@OS_WIN32_MINGW_TRUE@am__append_2 = sg_pt_win32.h
+@OS_WIN32_CYGWIN_TRUE@am__append_3 = sg_pt_win32.h
 subdir = include
 DIST_COMMON = $(am__noinst_HEADERS_DIST) \
 	$(am__scsiinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
@@ -223,64 +229,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 scsiincludedir = $(includedir)/scsi
-@OS_FREEBSD_TRUE@scsiinclude_HEADERS = \
-@OS_FREEBSD_TRUE@	sg_lib.h \
-@OS_FREEBSD_TRUE@	sg_lib_data.h \
-@OS_FREEBSD_TRUE@	sg_cmds.h \
-@OS_FREEBSD_TRUE@	sg_cmds_basic.h \
-@OS_FREEBSD_TRUE@	sg_cmds_extra.h \
-@OS_FREEBSD_TRUE@	sg_cmds_mmc.h \
-@OS_FREEBSD_TRUE@	sg_pt.h
-
-@OS_LINUX_TRUE@scsiinclude_HEADERS = \
-@OS_LINUX_TRUE@	sg_lib.h \
-@OS_LINUX_TRUE@	sg_lib_data.h \
-@OS_LINUX_TRUE@	sg_cmds.h \
-@OS_LINUX_TRUE@	sg_cmds_basic.h \
-@OS_LINUX_TRUE@	sg_cmds_extra.h \
-@OS_LINUX_TRUE@	sg_cmds_mmc.h \
-@OS_LINUX_TRUE@	sg_pt.h \
-@OS_LINUX_TRUE@	sg_linux_inc.h \
-@OS_LINUX_TRUE@	sg_io_linux.h
-
-@OS_OSF_TRUE@scsiinclude_HEADERS = \
-@OS_OSF_TRUE@	sg_lib.h \
-@OS_OSF_TRUE@	sg_lib_data.h \
-@OS_OSF_TRUE@	sg_cmds.h \
-@OS_OSF_TRUE@	sg_cmds_basic.h \
-@OS_OSF_TRUE@	sg_cmds_extra.h \
-@OS_OSF_TRUE@	sg_cmds_mmc.h \
-@OS_OSF_TRUE@	sg_pt.h
-
-@OS_SOLARIS_TRUE@scsiinclude_HEADERS = \
-@OS_SOLARIS_TRUE@	sg_lib.h \
-@OS_SOLARIS_TRUE@	sg_lib_data.h \
-@OS_SOLARIS_TRUE@	sg_cmds.h \
-@OS_SOLARIS_TRUE@	sg_cmds_basic.h \
-@OS_SOLARIS_TRUE@	sg_cmds_extra.h \
-@OS_SOLARIS_TRUE@	sg_cmds_mmc.h \
-@OS_SOLARIS_TRUE@	sg_pt.h
-
-@OS_WIN32_CYGWIN_TRUE@scsiinclude_HEADERS = \
-@OS_WIN32_CYGWIN_TRUE@	sg_lib.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_lib_data.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_cmds.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_cmds_basic.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_cmds_extra.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_cmds_mmc.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_pt.h \
-@OS_WIN32_CYGWIN_TRUE@	sg_pt_win32.h
-
-@OS_WIN32_MINGW_TRUE@scsiinclude_HEADERS = \
-@OS_WIN32_MINGW_TRUE@	sg_lib.h \
-@OS_WIN32_MINGW_TRUE@	sg_lib_data.h \
-@OS_WIN32_MINGW_TRUE@	sg_cmds.h \
-@OS_WIN32_MINGW_TRUE@	sg_cmds_basic.h \
-@OS_WIN32_MINGW_TRUE@	sg_cmds_extra.h \
-@OS_WIN32_MINGW_TRUE@	sg_cmds_mmc.h \
-@OS_WIN32_MINGW_TRUE@	sg_pt.h \
-@OS_WIN32_MINGW_TRUE@	sg_pt_win32.h
-
+scsiinclude_HEADERS = sg_lib.h sg_lib_data.h sg_cmds.h sg_cmds_basic.h \
+	sg_cmds_extra.h sg_cmds_mmc.h sg_pt.h $(am__append_1) \
+	$(am__append_2) $(am__append_3)
 @OS_FREEBSD_TRUE@noinst_HEADERS = \
 @OS_FREEBSD_TRUE@	sg_linux_inc.h \
 @OS_FREEBSD_TRUE@	sg_io_linux.h \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 18f57dd9..9d4616b3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,3 @@
-
-if OS_LINUX
-
 libsgutils2_la_SOURCES = \
 	sg_lib.c \
 	sg_lib_data.c \
@@ -8,134 +5,32 @@ libsgutils2_la_SOURCES = \
 	sg_cmds_basic2.c \
 	sg_cmds_extra.c \
 	sg_cmds_mmc.c \
-	sg_pt_common.c \
+	sg_pt_common.c 
+
+if OS_LINUX
+libsgutils2_la_SOURCES += \
 	sg_pt_linux.c \
 	sg_io_linux.c
-
-EXTRA_libsgutils2_la_SOURCES = \
-	sg_pt_freebsd.c \
-	sg_pt_osf1.c \
-	sg_pt_solaris.c \
-	sg_pt_win32.c \
-	getopt_long.c
-
 endif
 
-
 if OS_WIN32_MINGW
-
-libsgutils2_la_SOURCES = \
-	sg_lib.c \
-	sg_lib_data.c \
-	sg_cmds_basic.c \
-	sg_cmds_basic2.c \
-	sg_cmds_extra.c \
-	sg_cmds_mmc.c \
-	sg_pt_common.c \
-	sg_pt_win32.c
-
-EXTRA_libsgutils2_la_SOURCES = \
-	sg_pt_linux.c \
-	sg_io_linux.c \
-	sg_pt_freebsd.c \
-	sg_pt_osf1.c \
-	sg_pt_solaris.c \
-	getopt_long.c
-
+libsgutils2_la_SOURCES += sg_pt_win32.c
 endif
 
-
 if OS_WIN32_CYGWIN
-
-libsgutils2_la_SOURCES = \
-	sg_lib.c \
-	sg_lib_data.c \
-	sg_cmds_basic.c \
-	sg_cmds_basic2.c \
-	sg_cmds_extra.c \
-	sg_cmds_mmc.c \
-	sg_pt_common.c \
-	sg_pt_win32.c
-
-EXTRA_libsgutils2_la_SOURCES = \
-	sg_pt_linux.c \
-	sg_io_linux.c \
-	sg_pt_freebsd.c \
-	sg_pt_osf1.c \
-	sg_pt_solaris.c \
-	getopt_long.c
-
+libsgutils2_la_SOURCES += sg_pt_win32.c
 endif
 
-
 if OS_FREEBSD
-
-libsgutils2_la_SOURCES = \
-	sg_lib.c \
-	sg_lib_data.c \
-	sg_cmds_basic.c \
-	sg_cmds_basic2.c \
-	sg_cmds_extra.c \
-	sg_cmds_mmc.c \
-	sg_pt_common.c \
-	sg_pt_freebsd.c
-
-EXTRA_libsgutils2_la_SOURCES = \
-	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
-
+libsgutils2_la_SOURCES += sg_pt_freebsd.c
 endif
 
-
 if OS_SOLARIS
-
-libsgutils2_la_SOURCES = \
-	sg_lib.c \
-	sg_lib_data.c \
-	sg_cmds_basic.c \
-	sg_cmds_basic2.c \
-	sg_cmds_extra.c \
-	sg_cmds_mmc.c \
-	sg_pt_common.c \
-	sg_pt_solaris.c
-
-EXTRA_libsgutils2_la_SOURCES = \
-	sg_pt_linux.c \
-	sg_io_linux.c \
-	sg_linux_inc.h \
-	sg_pt_freebsd.c \
-	sg_pt_osf1.c \
-	sg_pt_win32.c \
-	getopt_long.c
-
+libsgutils2_la_SOURCES += sg_pt_solaris.c
 endif
 
-
 if OS_OSF
-
-libsgutils2_la_SOURCES = \
-	sg_lib.c \
-	sg_lib_data.c \
-	sg_cmds_basic.c \
-	sg_cmds_basic2.c \
-	sg_cmds_extra.c \
-	sg_cmds_mmc.c \
-	sg_pt_common.c \
-	sg_pt_osf1.c
-
-EXTRA_libsgutils2_la_SOURCES = \
-	sg_pt_linux.c \
-	sg_io_linux.c \
-	sg_pt_freebsd.c \
-	sg_pt_solaris.c \
-	sg_pt_win32.c \
-	getopt_long.c
-
+libsgutils2_la_SOURCES += sg_pt_osf1.c
 endif
 
 # For C++/clang testing
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 41c057fd..e9068ae9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -51,6 +51,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@OS_LINUX_TRUE@am__append_1 = \
+@OS_LINUX_TRUE@	sg_pt_linux.c \
+@OS_LINUX_TRUE@	sg_io_linux.c
+
+@OS_WIN32_MINGW_TRUE@am__append_2 = sg_pt_win32.c
+@OS_WIN32_CYGWIN_TRUE@am__append_3 = sg_pt_win32.c
+@OS_FREEBSD_TRUE@am__append_4 = sg_pt_freebsd.c
+@OS_SOLARIS_TRUE@am__append_5 = sg_pt_solaris.c
+@OS_OSF_TRUE@am__append_6 = sg_pt_osf1.c
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -92,56 +101,19 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__libsgutils2_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \
 	sg_cmds_basic.c sg_cmds_basic2.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@	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_basic2.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@	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_basic2.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@	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_basic2.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@	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_basic2.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@	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_basic2.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@	sg_cmds_basic.lo sg_cmds_basic2.lo \
-@OS_FREEBSD_TRUE@	sg_cmds_extra.lo sg_cmds_mmc.lo \
-@OS_FREEBSD_TRUE@	sg_pt_common.lo sg_pt_freebsd.lo
-am__EXTRA_libsgutils2_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
+	sg_pt_common.c sg_pt_linux.c sg_io_linux.c sg_pt_win32.c \
+	sg_pt_freebsd.c sg_pt_solaris.c sg_pt_osf1.c
+@OS_LINUX_TRUE@am__objects_1 = sg_pt_linux.lo sg_io_linux.lo
+@OS_WIN32_MINGW_TRUE@am__objects_2 = sg_pt_win32.lo
+@OS_WIN32_CYGWIN_TRUE@am__objects_3 = sg_pt_win32.lo
+@OS_FREEBSD_TRUE@am__objects_4 = sg_pt_freebsd.lo
+@OS_SOLARIS_TRUE@am__objects_5 = sg_pt_solaris.lo
+@OS_OSF_TRUE@am__objects_6 = sg_pt_osf1.lo
+am_libsgutils2_la_OBJECTS = sg_lib.lo sg_lib_data.lo sg_cmds_basic.lo \
+	sg_cmds_basic2.lo sg_cmds_extra.lo sg_cmds_mmc.lo \
+	sg_pt_common.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+	$(am__objects_6)
 libsgutils2_la_OBJECTS = $(am_libsgutils2_la_OBJECTS)
 libsgutils2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -159,9 +131,8 @@ 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 = $(libsgutils2_la_SOURCES)
+DIST_SOURCES = $(am__libsgutils2_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -286,116 +257,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@OS_FREEBSD_TRUE@libsgutils2_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_basic2.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@	sg_lib.c \
-@OS_LINUX_TRUE@	sg_lib_data.c \
-@OS_LINUX_TRUE@	sg_cmds_basic.c \
-@OS_LINUX_TRUE@	sg_cmds_basic2.c \
-@OS_LINUX_TRUE@	sg_cmds_extra.c \
-@OS_LINUX_TRUE@	sg_cmds_mmc.c \
-@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@	sg_lib.c \
-@OS_OSF_TRUE@	sg_lib_data.c \
-@OS_OSF_TRUE@	sg_cmds_basic.c \
-@OS_OSF_TRUE@	sg_cmds_basic2.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@	sg_lib.c \
-@OS_SOLARIS_TRUE@	sg_lib_data.c \
-@OS_SOLARIS_TRUE@	sg_cmds_basic.c \
-@OS_SOLARIS_TRUE@	sg_cmds_basic2.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@	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_basic2.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@	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_basic2.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@	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@	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@	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@	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@	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@	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 \
-@OS_WIN32_MINGW_TRUE@	sg_pt_solaris.c \
-@OS_WIN32_MINGW_TRUE@	getopt_long.c
-
+libsgutils2_la_SOURCES = sg_lib.c sg_lib_data.c sg_cmds_basic.c \
+	sg_cmds_basic2.c sg_cmds_extra.c sg_cmds_mmc.c sg_pt_common.c \
+	$(am__append_1) $(am__append_2) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6)
 
 # For C++/clang testing
 
@@ -481,7 +346,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt_long.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_cmds_basic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_cmds_basic2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_cmds_extra.Plo@am__quote@
diff --git a/sg3_utils.spec b/sg3_utils.spec
index d55f92eb..40ef173e 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -79,7 +79,7 @@ fi
 %{_libdir}/*.la
 
 %changelog
-* Mon Jun 03 2013 - dgilbert at interlog dot com
+* Fri Jun 14 2013 - dgilbert at interlog dot com
 - track t10 changes
   * sg3_utils-1.37
 
diff --git a/src/sg_inq.c b/src/sg_inq.c
index 33d8dad4..beb5a20e 100644
--- a/src/sg_inq.c
+++ b/src/sg_inq.c
@@ -67,7 +67,7 @@
  * information [MAINTENANCE IN, service action = 0xc]; see sg_opcodes.
  */
 
-static const char * version_str = "1.13 20130507";    /* SPC-4 rev 36 */
+static const char * version_str = "1.14 20130613";    /* SPC-4 rev 36 */
 
 
 /* Following VPD pages are in ascending page number order */
@@ -2018,7 +2018,7 @@ decode_b3_vpd(unsigned char * buff, int len, int do_hex, int pdt)
     }
     switch (pdt) {
         case PDT_DISK: case PDT_WO: case PDT_OPTICAL:
-            if (len < 0xc0) {
+            if (len < 0x10) {
                 fprintf(stderr, "Referrals VPD page length too short=%d\n",
                         len);
                 return;