diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | examples/Makefile | 31 | ||||
-rw-r--r-- | examples/README | 14 | ||||
-rw-r--r-- | lib/Makefile.am | 8 | ||||
-rw-r--r-- | lib/Makefile.in | 19 | ||||
-rw-r--r-- | lib/sg_io_linux.c (renamed from src/sg_io_linux.c) | 0 | ||||
-rw-r--r-- | sg3_utils.spec | 2 | ||||
-rw-r--r-- | src/Makefile.am | 18 | ||||
-rw-r--r-- | src/Makefile.in | 38 |
11 files changed, 83 insertions, 54 deletions
@@ -2,7 +2,7 @@ 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.26 [20080214] +Changelog for sg3_utils-1.26 [20080217] - sg_ses: sync with ses2r19b - sg_get_config: sync with mmc6r01 - allow Microcode upgrade and DVD read feature descriptors @@ -31,6 +31,7 @@ Changelog for sg3_utils-1.26 [20080214] - remove archive/pre_configure subdirectory - sg_dd, sgm_dd, sgp_dd, sginfo, sg_rbuf, sg_read: replace "%lld" and friends with PRI macros + - move sg_io_linux.c into the lib subdirectory Changelog for sg3_utils-1.25 [20071016] - sg_stpg: new utility to Set Target Port Groups @@ -328,4 +328,4 @@ See http://www.torque.net/sg/tools.html Doug Gilbert -11th February 2008 +17th February 2008 diff --git a/debian/changelog b/debian/changelog index e7660ee6..9d9029ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ sg3-utils (1.26-0.1) unstable; urgency=low * New upstream version - -- Doug Gilbert <dgilbert@interlog.com> Thu, 14 Feb 2008 22:00:00 -0500 + -- Doug Gilbert <dgilbert@interlog.com> Sun, 17 Feb 2008 23:00:00 -0500 sg3-utils (1.25-0.1) unstable; urgency=low diff --git a/examples/Makefile b/examples/Makefile index 98d0b638..641e1f78 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -26,6 +26,9 @@ CFLAGS = -g -O2 -W -Wall -I../include -D_REENTRANT $(LARGE_FILE_FLAGS) LDFLAGS = +LIBFILESOLD = ../lib/sg_lib.o ../lib/sg_lib_data.o ../lib/sg_io_linux.o +LIBFILESNEW = ../lib/sg_lib.o ../lib/sg_lib_data.o ../lib/sg_pt_linux.o + all: $(EXECS) depend dep: @@ -35,52 +38,52 @@ depend dep: clean: /bin/rm -f *.o $(EXECS) core .depend -sg_simple1: sg_simple1.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_simple1: sg_simple1.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ sg_simple2: sg_simple2.o $(LD) -o $@ $(LDFLAGS) $^ -sg_simple3: sg_simple3.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_simple3: sg_simple3.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_simple4: sg_simple4.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_simple4: sg_simple4.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_simple16: sg_simple16.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_simple16: sg_simple16.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_simple_aio: sg_simple_aio.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_simple_aio: sg_simple_aio.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -l aio -sg_iovec_tst: sg_iovec_tst.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_iovec_tst: sg_iovec_tst.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ scsi_inquiry: scsi_inquiry.o $(LD) -o $@ $(LDFLAGS) $^ -sg_excl: sg_excl.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_excl: sg_excl.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_sense_test: sg_sense_test.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_sense_test: sg_sense_test.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_simple5: sg_simple5.o ../lib/sg_lib.o ../lib/sg_pt_linux.o +sg_simple5: sg_simple5.o $(LIBFILESNEW) $(LD) -o $@ $(LDFLAGS) $^ -sg__sat_identify: sg__sat_identify.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg__sat_identify: sg__sat_identify.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg__sat_phy_event: sg__sat_phy_event.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg__sat_phy_event: sg__sat_phy_event.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg__sat_set_features: sg__sat_set_features.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg__sat_set_features: sg__sat_set_features.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_sat_chk_power: sg_sat_chk_power.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_sat_chk_power: sg_sat_chk_power.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ -sg_sat_smart_rd_data: sg_sat_smart_rd_data.o ../lib/sg_lib.o ../src/sg_io_linux.o +sg_sat_smart_rd_data: sg_sat_smart_rd_data.o $(LIBFILESOLD) $(LD) -o $@ $(LDFLAGS) $^ install: $(EXECS) diff --git a/examples/README b/examples/README new file mode 100644 index 00000000..3a11f4bc --- /dev/null +++ b/examples/README @@ -0,0 +1,14 @@ +Building files in this directory depends on several files being already +built in the ../lib directory. So to build files here, the ./configure +needs to be executed in the parent directory followed by changing +directory to the lib directory and calling 'make' there. +Another way is to do a top level 'make' after the ./configure which +will make the libraries followed by all the utilities in the src/ +directory. + +There is an brief explanation of each example in the README file in +the main (i.e. this directory's parent) directory. There are also +some notes at the top of each source file. + +Doug Gilbert +17th February 2008 diff --git a/lib/Makefile.am b/lib/Makefile.am index 7f730470..b5e7c136 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,7 +7,8 @@ libsgutils_la_SOURCES = \ sg_lib_data.c \ sg_cmds_basic.c \ sg_cmds_extra.c \ - sg_pt_linux.c + sg_pt_linux.c \ + sg_io_linux.c EXTRA_libsgutils_la_SOURCES = \ sg_pt_freebsd.c \ @@ -30,6 +31,7 @@ libsgutils_la_SOURCES = \ EXTRA_libsgutils_la_SOURCES = \ sg_pt_linux.c \ + sg_io_linux.c \ sg_pt_freebsd.c \ sg_pt_osf1.c \ sg_pt_solaris.c \ @@ -49,6 +51,7 @@ libsgutils_la_SOURCES = \ EXTRA_libsgutils_la_SOURCES = \ sg_pt_linux.c \ + sg_io_linux.c \ sg_pt_freebsd.c \ sg_pt_osf1.c \ sg_pt_solaris.c \ @@ -68,6 +71,7 @@ libsgutils_la_SOURCES = \ EXTRA_libsgutils_la_SOURCES = \ sg_pt_linux.c \ + sg_io_linux.c \ sg_linux_inc.h \ sg_pt_osf1.c \ sg_pt_solaris.c \ @@ -88,6 +92,7 @@ libsgutils_la_SOURCES = \ EXTRA_libsgutils_la_SOURCES = \ sg_pt_linux.c \ + sg_io_linux.c \ sg_linux_inc.h \ sg_pt_freebsd.c \ sg_pt_osf1.c \ @@ -108,6 +113,7 @@ libsgutils_la_SOURCES = \ EXTRA_libsgutils_la_SOURCES = \ sg_pt_linux.c \ + sg_io_linux.c \ sg_pt_freebsd.c \ sg_pt_solaris.c \ sg_pt_win32.c \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 4bae8444..b255c900 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -52,7 +52,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__libsgutils_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \ sg_cmds_basic.c sg_cmds_extra.c sg_pt_freebsd.c sg_pt_linux.c \ - sg_pt_osf1.c sg_pt_solaris.c sg_pt_win32.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_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 \ @@ -78,13 +78,13 @@ am__libsgutils_la_SOURCES_DIST = sg_lib.c sg_lib_data.c \ @OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ 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_pt_linux.lo +@OS_FREEBSD_FALSE@@OS_LINUX_TRUE@ sg_pt_linux.lo sg_io_linux.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_pt_freebsd.lo -am__EXTRA_libsgutils_la_SOURCES_DIST = sg_pt_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 +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 libsgutils_la_OBJECTS = $(am_libsgutils_la_OBJECTS) libsgutils_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -227,7 +227,8 @@ top_srcdir = @top_srcdir@ @OS_LINUX_TRUE@ sg_lib_data.c \ @OS_LINUX_TRUE@ sg_cmds_basic.c \ @OS_LINUX_TRUE@ sg_cmds_extra.c \ -@OS_LINUX_TRUE@ sg_pt_linux.c +@OS_LINUX_TRUE@ sg_pt_linux.c \ +@OS_LINUX_TRUE@ sg_io_linux.c @OS_OSF_TRUE@libsgutils_la_SOURCES = \ @OS_OSF_TRUE@ sg_lib.c \ @@ -259,6 +260,7 @@ top_srcdir = @top_srcdir@ @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 \ @@ -274,6 +276,7 @@ top_srcdir = @top_srcdir@ @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 \ @@ -281,6 +284,7 @@ top_srcdir = @top_srcdir@ @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 \ @@ -289,6 +293,7 @@ top_srcdir = @top_srcdir@ @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 \ @@ -296,6 +301,7 @@ top_srcdir = @top_srcdir@ @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 \ @OS_WIN32_MINGW_TRUE@ sg_pt_solaris.c \ @@ -379,6 +385,7 @@ distclean-compile: @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_extra.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_io_linux.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_lib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_lib_data.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_pt_freebsd.Plo@am__quote@ diff --git a/src/sg_io_linux.c b/lib/sg_io_linux.c index cb8ad6e7..cb8ad6e7 100644 --- a/src/sg_io_linux.c +++ b/lib/sg_io_linux.c diff --git a/sg3_utils.spec b/sg3_utils.spec index 9c3e62b1..7e425112 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -79,7 +79,7 @@ fi %{_libdir}/*.la %changelog -* Thu Feb 14 2008 - dgilbert at interlog dot com +* Sun Feb 17 2008 - dgilbert at interlog dot com - sg_get_config sync with mmc6r01, add sg_sat_phy_event * sg3_utils-1.26 diff --git a/src/Makefile.am b/src/Makefile.am index b68ed5f3..dcce9015 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,7 +104,7 @@ 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_io_linux.c +sg_dd_SOURCES = sg_dd.c sg_dd_LDADD = ../lib/libsgutils.la @os_libs@ sg_emc_trespass_SOURCES = sg_emc_trespass.c @@ -119,7 +119,7 @@ sg_get_config_LDADD = ../lib/libsgutils.la @os_libs@ sg_ident_SOURCES = sg_ident.c sg_ident_LDADD = ../lib/libsgutils.la @os_libs@ -sginfo_SOURCES = sginfo.c sg_io_linux.c +sginfo_SOURCES = sginfo.c sginfo_LDADD = ../lib/libsgutils.la @os_libs@ sg_inq_SOURCES = sg_inq.c sg_inq_data.c @@ -134,10 +134,10 @@ 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_io_linux.c +sg_map_SOURCES = sg_map.c sg_map_LDADD = ../lib/libsgutils.la @os_libs@ -sgm_dd_SOURCES = sgm_dd.c sg_io_linux.c +sgm_dd_SOURCES = sgm_dd.c sgm_dd_LDADD = ../lib/libsgutils.la @os_libs@ sg_modes_SOURCES = sg_modes.c @@ -146,7 +146,7 @@ sg_modes_LDADD = ../lib/libsgutils.la @os_libs@ sg_opcodes_SOURCES = sg_opcodes.c sg_opcodes_LDADD = ../lib/libsgutils.la @os_libs@ -sgp_dd_SOURCES = sgp_dd.c sg_io_linux.c +sgp_dd_SOURCES = sgp_dd.c sgp_dd_LDADD = ../lib/libsgutils.la @os_libs@ -lpthread sg_persist_SOURCES = sg_persist.c @@ -158,13 +158,13 @@ sg_prevent_LDADD = ../lib/libsgutils.la @os_libs@ sg_raw_SOURCES = sg_raw.c sg_raw_LDADD = ../lib/libsgutils.la @os_libs@ -sg_rbuf_SOURCES = sg_rbuf.c sg_io_linux.c +sg_rbuf_SOURCES = sg_rbuf.c sg_rbuf_LDADD = ../lib/libsgutils.la @os_libs@ sg_rdac_SOURCES = sg_rdac.c sg_rdac_LDADD = ../lib/libsgutils.la @os_libs@ -sg_read_SOURCES = sg_read.c sg_io_linux.c +sg_read_SOURCES = sg_read.c sg_read_LDADD = ../lib/libsgutils.la @os_libs@ sg_readcap_SOURCES = sg_readcap.c @@ -203,7 +203,7 @@ 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/libsgutils.la @os_libs@ -sg_scan_SOURCES = sg_scan.c sg_io_linux.c +sg_scan_SOURCES = sg_scan.c sg_scan_LDADD = ../lib/libsgutils.la @os_libs@ sg_senddiag_SOURCES = sg_senddiag.c @@ -221,7 +221,7 @@ sg_stpg_LDADD = ../lib/libsgutils.la @os_libs@ sg_sync_SOURCES = sg_sync.c sg_sync_LDADD = ../lib/libsgutils.la @os_libs@ -sg_test_rwbuf_SOURCES = sg_test_rwbuf.c sg_io_linux.c +sg_test_rwbuf_SOURCES = sg_test_rwbuf.c sg_test_rwbuf_LDADD = ../lib/libsgutils.la @os_libs@ sg_turs_SOURCES = sg_turs.c diff --git a/src/Makefile.in b/src/Makefile.in index 2cb412fe..90b6bc14 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -247,7 +247,7 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_sg_dd_OBJECTS = sg_dd.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sg_dd_OBJECTS = sg_dd.$(OBJEXT) sg_dd_OBJECTS = $(am_sg_dd_OBJECTS) sg_dd_DEPENDENCIES = ../lib/libsgutils.la am_sg_emc_trespass_OBJECTS = sg_emc_trespass.$(OBJEXT) @@ -271,7 +271,7 @@ sg_logs_DEPENDENCIES = ../lib/libsgutils.la am_sg_luns_OBJECTS = sg_luns.$(OBJEXT) sg_luns_OBJECTS = $(am_sg_luns_OBJECTS) sg_luns_DEPENDENCIES = ../lib/libsgutils.la -am_sg_map_OBJECTS = sg_map.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sg_map_OBJECTS = sg_map.$(OBJEXT) sg_map_OBJECTS = $(am_sg_map_OBJECTS) sg_map_DEPENDENCIES = ../lib/libsgutils.la am_sg_map26_OBJECTS = sg_map26.$(OBJEXT) @@ -292,13 +292,13 @@ sg_prevent_DEPENDENCIES = ../lib/libsgutils.la am_sg_raw_OBJECTS = sg_raw.$(OBJEXT) sg_raw_OBJECTS = $(am_sg_raw_OBJECTS) sg_raw_DEPENDENCIES = ../lib/libsgutils.la -am_sg_rbuf_OBJECTS = sg_rbuf.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sg_rbuf_OBJECTS = sg_rbuf.$(OBJEXT) sg_rbuf_OBJECTS = $(am_sg_rbuf_OBJECTS) sg_rbuf_DEPENDENCIES = ../lib/libsgutils.la am_sg_rdac_OBJECTS = sg_rdac.$(OBJEXT) sg_rdac_OBJECTS = $(am_sg_rdac_OBJECTS) sg_rdac_DEPENDENCIES = ../lib/libsgutils.la -am_sg_read_OBJECTS = sg_read.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sg_read_OBJECTS = sg_read.$(OBJEXT) sg_read_OBJECTS = $(am_sg_read_OBJECTS) sg_read_DEPENDENCIES = ../lib/libsgutils.la am_sg_read_buffer_OBJECTS = sg_read_buffer.$(OBJEXT) @@ -337,7 +337,7 @@ 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/libsgutils.la -am_sg_scan_OBJECTS = sg_scan.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sg_scan_OBJECTS = sg_scan.$(OBJEXT) sg_scan_OBJECTS = $(am_sg_scan_OBJECTS) sg_scan_DEPENDENCIES = ../lib/libsgutils.la am_sg_senddiag_OBJECTS = sg_senddiag.$(OBJEXT) @@ -355,8 +355,7 @@ sg_stpg_DEPENDENCIES = ../lib/libsgutils.la am_sg_sync_OBJECTS = sg_sync.$(OBJEXT) sg_sync_OBJECTS = $(am_sg_sync_OBJECTS) sg_sync_DEPENDENCIES = ../lib/libsgutils.la -am_sg_test_rwbuf_OBJECTS = sg_test_rwbuf.$(OBJEXT) \ - sg_io_linux.$(OBJEXT) +am_sg_test_rwbuf_OBJECTS = sg_test_rwbuf.$(OBJEXT) sg_test_rwbuf_OBJECTS = $(am_sg_test_rwbuf_OBJECTS) sg_test_rwbuf_DEPENDENCIES = ../lib/libsgutils.la am_sg_turs_OBJECTS = sg_turs.$(OBJEXT) @@ -377,13 +376,13 @@ 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/libsgutils.la -am_sginfo_OBJECTS = sginfo.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sginfo_OBJECTS = sginfo.$(OBJEXT) sginfo_OBJECTS = $(am_sginfo_OBJECTS) sginfo_DEPENDENCIES = ../lib/libsgutils.la -am_sgm_dd_OBJECTS = sgm_dd.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sgm_dd_OBJECTS = sgm_dd.$(OBJEXT) sgm_dd_OBJECTS = $(am_sgm_dd_OBJECTS) sgm_dd_DEPENDENCIES = ../lib/libsgutils.la -am_sgp_dd_OBJECTS = sgp_dd.$(OBJEXT) sg_io_linux.$(OBJEXT) +am_sgp_dd_OBJECTS = sgp_dd.$(OBJEXT) sgp_dd_OBJECTS = $(am_sgp_dd_OBJECTS) sgp_dd_DEPENDENCIES = ../lib/libsgutils.la DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ @@ -549,7 +548,7 @@ 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_io_linux.c +sg_dd_SOURCES = sg_dd.c sg_dd_LDADD = ../lib/libsgutils.la @os_libs@ sg_emc_trespass_SOURCES = sg_emc_trespass.c sg_emc_trespass_LDADD = ../lib/libsgutils.la @os_libs@ @@ -559,7 +558,7 @@ sg_get_config_SOURCES = sg_get_config.c sg_get_config_LDADD = ../lib/libsgutils.la @os_libs@ sg_ident_SOURCES = sg_ident.c sg_ident_LDADD = ../lib/libsgutils.la @os_libs@ -sginfo_SOURCES = sginfo.c sg_io_linux.c +sginfo_SOURCES = sginfo.c sginfo_LDADD = ../lib/libsgutils.la @os_libs@ sg_inq_SOURCES = sg_inq.c sg_inq_data.c sg_inq_LDADD = ../lib/libsgutils.la @os_libs@ @@ -569,15 +568,15 @@ sg_luns_SOURCES = sg_luns.c 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_io_linux.c +sg_map_SOURCES = sg_map.c sg_map_LDADD = ../lib/libsgutils.la @os_libs@ -sgm_dd_SOURCES = sgm_dd.c sg_io_linux.c +sgm_dd_SOURCES = sgm_dd.c sgm_dd_LDADD = ../lib/libsgutils.la @os_libs@ sg_modes_SOURCES = sg_modes.c sg_modes_LDADD = ../lib/libsgutils.la @os_libs@ sg_opcodes_SOURCES = sg_opcodes.c sg_opcodes_LDADD = ../lib/libsgutils.la @os_libs@ -sgp_dd_SOURCES = sgp_dd.c sg_io_linux.c +sgp_dd_SOURCES = sgp_dd.c sgp_dd_LDADD = ../lib/libsgutils.la @os_libs@ -lpthread sg_persist_SOURCES = sg_persist.c sg_persist_LDADD = ../lib/libsgutils.la @os_libs@ @@ -585,11 +584,11 @@ sg_prevent_SOURCES = sg_prevent.c sg_prevent_LDADD = ../lib/libsgutils.la @os_libs@ sg_raw_SOURCES = sg_raw.c sg_raw_LDADD = ../lib/libsgutils.la @os_libs@ -sg_rbuf_SOURCES = sg_rbuf.c sg_io_linux.c +sg_rbuf_SOURCES = sg_rbuf.c sg_rbuf_LDADD = ../lib/libsgutils.la @os_libs@ sg_rdac_SOURCES = sg_rdac.c sg_rdac_LDADD = ../lib/libsgutils.la @os_libs@ -sg_read_SOURCES = sg_read.c sg_io_linux.c +sg_read_SOURCES = sg_read.c sg_read_LDADD = ../lib/libsgutils.la @os_libs@ sg_readcap_SOURCES = sg_readcap.c sg_readcap_LDADD = ../lib/libsgutils.la @os_libs@ @@ -615,7 +614,7 @@ sg_sat_phy_event_SOURCES = sg_sat_phy_event.c 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/libsgutils.la @os_libs@ -sg_scan_SOURCES = sg_scan.c sg_io_linux.c +sg_scan_SOURCES = sg_scan.c sg_scan_LDADD = ../lib/libsgutils.la @os_libs@ sg_senddiag_SOURCES = sg_senddiag.c sg_senddiag_LDADD = ../lib/libsgutils.la @os_libs@ @@ -627,7 +626,7 @@ sg_stpg_SOURCES = sg_stpg.c sg_stpg_LDADD = ../lib/libsgutils.la @os_libs@ sg_sync_SOURCES = sg_sync.c sg_sync_LDADD = ../lib/libsgutils.la @os_libs@ -sg_test_rwbuf_SOURCES = sg_test_rwbuf.c sg_io_linux.c +sg_test_rwbuf_SOURCES = sg_test_rwbuf.c sg_test_rwbuf_LDADD = ../lib/libsgutils.la @os_libs@ sg_turs_SOURCES = sg_turs.c sg_turs_LDADD = ../lib/libsgutils.la @os_libs@ @@ -854,7 +853,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_ident.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_inq.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_inq_data.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_io_linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_logs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_luns.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_map.Po@am__quote@ |