diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2018-01-03 05:40:58 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-01-03 05:40:58 +0000 |
commit | a0df198b498b114e901cb022acddcc14330275da (patch) | |
tree | 724e2461cf7b93d923f5b3a41062e0c042245bb8 /src/Makefile.in | |
parent | cd3508dc77d96ee24007928391b66273c36b34f7 (diff) | |
download | sg3_utils-a0df198b498b114e901cb022acddcc14330275da.tar.gz |
sg_inq: add --only option, further sanity checks on --inhex so CDROM std inq not confused with VPD page 0x80; sgp_dd: use pthread_kill(); various configure.ac and Makefile.am cleanups
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@742 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/Makefile.in')
-rw-r--r-- | src/Makefile.in | 147 |
1 files changed, 72 insertions, 75 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 7b446b09..58b81399 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -188,7 +188,7 @@ sg_map_OBJECTS = sg_map.$(OBJEXT) sg_map_DEPENDENCIES = ../lib/libsgutils2.la sg_map26_SOURCES = sg_map26.c sg_map26_OBJECTS = sg_map26.$(OBJEXT) -sg_map26_DEPENDENCIES = +sg_map26_LDADD = $(LDADD) sg_modes_SOURCES = sg_modes.c sg_modes_OBJECTS = sg_modes.$(OBJEXT) sg_modes_DEPENDENCIES = ../lib/libsgutils2.la @@ -242,7 +242,7 @@ sg_requests_OBJECTS = sg_requests.$(OBJEXT) sg_requests_DEPENDENCIES = ../lib/libsgutils2.la sg_reset_SOURCES = sg_reset.c sg_reset_OBJECTS = sg_reset.$(OBJEXT) -sg_reset_DEPENDENCIES = +sg_reset_LDADD = $(LDADD) sg_reset_wp_SOURCES = sg_reset_wp.c sg_reset_wp_OBJECTS = sg_reset_wp.$(OBJEXT) sg_reset_wp_DEPENDENCIES = ../lib/libsgutils2.la @@ -499,6 +499,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PTHREAD_LIB = @PTHREAD_LIB@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -545,8 +546,6 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -os_cflags = @os_cflags@ -os_libs = @os_libs@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -564,83 +563,81 @@ sg_scan_SOURCES = $(am__append_2) $(am__append_4) $(am__append_6) # For C++/clang testing -# -std=<s> can be c99, c11, gnu11, etc. Default is gnu89 (gnu90 is the same) +# -std=<s> can be c99, c11, gnu11, etc. Default is gnu11 # -Wall is no longer all warnings. Add -W (since renamed to -Wextra) for more AM_CPPFLAGS = -iquote ${top_srcdir}/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -AM_CFLAGS = -Wall -W @os_cflags@ -# AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c11 -# AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c11 --analyze -# AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c++14 -sg_bg_ctl_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_compare_and_write_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_copy_results_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_decode_sense_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_emc_trespass_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_format_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_get_config_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_get_lba_status_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_ident_LDADD = ../lib/libsgutils2.la @os_libs@ -sginfo_LDADD = ../lib/libsgutils2.la @os_libs@ +AM_CFLAGS = -Wall -W +# AM_CFLAGS = -Wall -W -pedantic -std=c11 +# AM_CFLAGS = -Wall -W -pedantic -std=c11 --analyze +# AM_CFLAGS = -Wall -W -pedantic -std=c++14 +sg_bg_ctl_LDADD = ../lib/libsgutils2.la +sg_compare_and_write_LDADD = ../lib/libsgutils2.la +sg_copy_results_LDADD = ../lib/libsgutils2.la +sg_dd_LDADD = ../lib/libsgutils2.la +sg_decode_sense_LDADD = ../lib/libsgutils2.la +sg_emc_trespass_LDADD = ../lib/libsgutils2.la +sg_format_LDADD = ../lib/libsgutils2.la +sg_get_config_LDADD = ../lib/libsgutils2.la +sg_get_lba_status_LDADD = ../lib/libsgutils2.la +sg_ident_LDADD = ../lib/libsgutils2.la +sginfo_LDADD = ../lib/libsgutils2.la sg_inq_SOURCES = sg_inq.c sg_inq_data.c -sg_inq_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_logs_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_luns_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_map26_LDADD = @os_libs@ -sg_map_LDADD = ../lib/libsgutils2.la @os_libs@ -sgm_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_modes_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_opcodes_LDADD = ../lib/libsgutils2.la @os_libs@ -sgp_dd_LDADD = ../lib/libsgutils2.la @os_libs@ -lpthread -sg_persist_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_prevent_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_raw_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_rbuf_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_rdac_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_read_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_read_attr_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_readcap_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_read_block_limits_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_read_buffer_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_read_long_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_reassign_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_requests_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_referrals_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_rep_zones_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_reset_LDADD = @os_libs@ -sg_reset_wp_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_rmsn_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_rtpg_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_safte_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_sanitize_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_sat_identify_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_sat_phy_event_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_sat_read_gplog_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_sat_set_features_LDADD = ../lib/libsgutils2.la @os_libs@ +sg_inq_LDADD = ../lib/libsgutils2.la +sg_logs_LDADD = ../lib/libsgutils2.la +sg_luns_LDADD = ../lib/libsgutils2.la +sg_map_LDADD = ../lib/libsgutils2.la +sgm_dd_LDADD = ../lib/libsgutils2.la +sg_modes_LDADD = ../lib/libsgutils2.la +sg_opcodes_LDADD = ../lib/libsgutils2.la +sgp_dd_LDADD = ../lib/libsgutils2.la @PTHREAD_LIB@ +sg_persist_LDADD = ../lib/libsgutils2.la +sg_prevent_LDADD = ../lib/libsgutils2.la +sg_raw_LDADD = ../lib/libsgutils2.la +sg_rbuf_LDADD = ../lib/libsgutils2.la +sg_rdac_LDADD = ../lib/libsgutils2.la +sg_read_LDADD = ../lib/libsgutils2.la +sg_read_attr_LDADD = ../lib/libsgutils2.la +sg_readcap_LDADD = ../lib/libsgutils2.la +sg_read_block_limits_LDADD = ../lib/libsgutils2.la +sg_read_buffer_LDADD = ../lib/libsgutils2.la +sg_read_long_LDADD = ../lib/libsgutils2.la +sg_reassign_LDADD = ../lib/libsgutils2.la +sg_requests_LDADD = ../lib/libsgutils2.la +sg_referrals_LDADD = ../lib/libsgutils2.la +sg_rep_zones_LDADD = ../lib/libsgutils2.la +sg_reset_wp_LDADD = ../lib/libsgutils2.la +sg_rmsn_LDADD = ../lib/libsgutils2.la +sg_rtpg_LDADD = ../lib/libsgutils2.la +sg_safte_LDADD = ../lib/libsgutils2.la +sg_sanitize_LDADD = ../lib/libsgutils2.la +sg_sat_identify_LDADD = ../lib/libsgutils2.la +sg_sat_phy_event_LDADD = ../lib/libsgutils2.la +sg_sat_read_gplog_LDADD = ../lib/libsgutils2.la +sg_sat_set_features_LDADD = ../lib/libsgutils2.la # sg_scan_SOURCES list is already set above in the platform-specific sections -sg_scan_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_senddiag_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_ses_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_ses_microcode_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_start_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_stpg_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_sync_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_test_rwbuf_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_timestamp_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_turs_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_unmap_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_verify_LDADD = ../lib/libsgutils2.la @os_libs@ +sg_scan_LDADD = ../lib/libsgutils2.la +sg_senddiag_LDADD = ../lib/libsgutils2.la +sg_ses_LDADD = ../lib/libsgutils2.la +sg_ses_microcode_LDADD = ../lib/libsgutils2.la +sg_start_LDADD = ../lib/libsgutils2.la +sg_stpg_LDADD = ../lib/libsgutils2.la +sg_sync_LDADD = ../lib/libsgutils2.la +sg_test_rwbuf_LDADD = ../lib/libsgutils2.la +sg_timestamp_LDADD = ../lib/libsgutils2.la +sg_turs_LDADD = ../lib/libsgutils2.la +sg_unmap_LDADD = ../lib/libsgutils2.la +sg_verify_LDADD = ../lib/libsgutils2.la sg_vpd_SOURCES = sg_vpd.c sg_vpd_vendor.c -sg_vpd_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_wr_mode_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_write_buffer_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_write_long_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_write_same_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_write_verify_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_write_x_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_xcopy_LDADD = ../lib/libsgutils2.la @os_libs@ -sg_zone_LDADD = ../lib/libsgutils2.la @os_libs@ +sg_vpd_LDADD = ../lib/libsgutils2.la +sg_wr_mode_LDADD = ../lib/libsgutils2.la +sg_write_buffer_LDADD = ../lib/libsgutils2.la +sg_write_long_LDADD = ../lib/libsgutils2.la +sg_write_same_LDADD = ../lib/libsgutils2.la +sg_write_verify_LDADD = ../lib/libsgutils2.la +sg_write_x_LDADD = ../lib/libsgutils2.la +sg_xcopy_LDADD = ../lib/libsgutils2.la +sg_zone_LDADD = ../lib/libsgutils2.la all: all-am .SUFFIXES: |