[med-svn] [htslib] 01/10: Added dependency from knetfile.c to hts_log.h, with some cascading. Added missing dependencies to the Makefile, including the missing definition of htslib_hts_h.

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to annotated tag 1.5
in repository htslib.

commit 8d201be944844b34c658e95d8c84c3b2a6ea8ffd
Author: Anders Kaplan <anders.kaplan at magasin1.se>
Date:   Sat Jun 3 21:45:10 2017 +0200

    Added dependency from knetfile.c to hts_log.h, with some cascading. Added missing dependencies to the Makefile, including the missing definition of htslib_hts_h.
---
 Makefile         | 4 +++-
 htslib/hts_log.h | 2 ++
 knetfile.c       | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bbba897..7942f93 100644
--- a/Makefile
+++ b/Makefile
@@ -191,6 +191,8 @@ cram_samtools_h = cram/cram_samtools.h $(htslib_sam_h) $(cram_sam_header_h)
 cram_structs_h = cram/cram_structs.h $(htslib_thread_pool_h) cram/string_alloc.h $(htslib_khash_h)
 cram_open_trace_file_h = cram/open_trace_file.h cram/mFILE.h
 hfile_internal_h = hfile_internal.h $(htslib_hfile_h)
+hts_log_h = htslib/hts_defs.h htslib/hts_log.h
+htslib_hts_h = htslib/hts.h $(hts_log_h)
 hts_internal_h = hts_internal.h $(htslib_hts_h)
 thread_pool_internal_h = thread_pool_internal.h $(htslib_thread_pool_h)
 
@@ -292,7 +294,7 @@ cyghts-$(LIBHTS_SOVERSION).dll: $(LIBHTS_OBJS)
 bgzf.o bgzf.pico: bgzf.c config.h $(htslib_hts_h) $(htslib_bgzf_h) $(htslib_hfile_h) $(htslib_thread_pool_h) cram/pooled_alloc.h $(htslib_khash_h)
 errmod.o errmod.pico: errmod.c config.h $(htslib_hts_h) $(htslib_ksort_h)
 kstring.o kstring.pico: kstring.c config.h $(htslib_kstring_h)
-knetfile.o knetfile.pico: knetfile.c config.h $(htslib_knetfile_h)
+knetfile.o knetfile.pico: knetfile.c config.h $(hts_log_h) $(htslib_knetfile_h)
 hfile.o hfile.pico: hfile.c config.h $(htslib_hfile_h) $(hfile_internal_h) $(hts_internal_h) $(htslib_khash_h)
 hfile_gcs.o hfile_gcs.pico: hfile_gcs.c config.h $(htslib_hts_h) $(htslib_kstring_h) $(hfile_internal_h)
 hfile_libcurl.o hfile_libcurl.pico: hfile_libcurl.c config.h $(hfile_internal_h) $(htslib_hts_h) $(htslib_kstring_h)
diff --git a/htslib/hts_log.h b/htslib/hts_log.h
index 82f92d6..4273738 100644
--- a/htslib/hts_log.h
+++ b/htslib/hts_log.h
@@ -29,6 +29,8 @@ SOFTWARE.
 #ifndef HTS_LOG_H
 #define HTS_LOG_H
 
+#include "hts_defs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/knetfile.c b/knetfile.c
index 26d9cb5..9e8af13 100644
--- a/knetfile.c
+++ b/knetfile.c
@@ -47,6 +47,7 @@
 #endif
 
 #include "htslib/knetfile.h"
+#include "htslib/hts_log.h"
 
 /* In winsock.h, the type of a socket is SOCKET, which is: "typedef
  * u_int SOCKET". An invalid SOCKET is: "(SOCKET)(~0)", or signed

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git