Skip to content

Commit

Permalink
Fix sam_view.o dependencies (and other very minor updates)
Browse files Browse the repository at this point in the history
Add recently-added $(htslib_hts_expr_h) inclusion.
Update .ci_helpers/clone comment. Fix configure.ac typo so
user-specified $CPPFLAGS aren't ignored on MSYS/MinGW.
  • Loading branch information
jmarshall committed Feb 10, 2021
1 parent 2257c57 commit f40e38b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci_helpers/clone
@@ -1,5 +1,5 @@
#!/bin/sh
# Usage: .travis/clone REPOSITORY [DIR] [BRANCH]
# Usage: .ci_helpers/clone REPOSITORY [DIR] [BRANCH]
#
# Creates a shallow clone, checking out the specified branch. If BRANCH is
# omitted or if there is no branch with that name, checks out origin/HEAD
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -202,7 +202,7 @@ phase.o: phase.c config.h $(htslib_hts_h) $(htslib_sam_h) $(htslib_kstring_h) $(
sam.o: sam.c config.h $(htslib_faidx_h) $(sam_h)
sam_opts.o: sam_opts.c config.h $(sam_opts_h)
sam_utils.o: sam_utils.c config.h $(samtools_h)
sam_view.o: sam_view.c config.h $(htslib_sam_h) $(htslib_faidx_h) $(htslib_khash_h) $(htslib_thread_pool_h) $(samtools_h) $(sam_opts_h) $(bedidx_h)
sam_view.o: sam_view.c config.h $(htslib_sam_h) $(htslib_faidx_h) $(htslib_khash_h) $(htslib_thread_pool_h) $(htslib_hts_expr_h) $(samtools_h) $(sam_opts_h) $(bedidx_h)
sample.o: sample.c config.h $(sample_h) $(htslib_khash_h)
stats_isize.o: stats_isize.c config.h $(stats_isize_h) $(htslib_khash_h)
stats.o: stats.c config.h $(htslib_faidx_h) $(htslib_sam_h) $(htslib_hts_h) $(htslib_hts_defs_h) $(htslib_khash_str2int_h) $(samtools_h) $(htslib_khash_h) $(htslib_kstring_h) $(stats_isize_h) $(sam_opts_h) $(bedidx_h)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -137,7 +137,7 @@ case $host_alias in
# This also sets __USE_MINGW_ANSI_STDIO which in turn makes PRId64,
# %lld and %z printf formats work. It also enforces the snprintf to
# be C99 compliant so it returns the correct values (in kstring.c).
CPPFLAGS="$CPPCFLAGS -D_XOPEN_SOURCE=600"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600"
;;
esac

Expand Down

0 comments on commit f40e38b

Please sign in to comment.