diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.in | 389 | ||||
-rw-r--r-- | src/htslib.c | 24 | ||||
-rw-r--r-- | src/htsname.c | 2 |
3 files changed, 299 insertions, 116 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 5971404..bddcc2d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = proxytrack$(EXEEXT) httrack$(EXEEXT) htsserver$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -93,10 +101,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(whttrackrundir)" "$(DESTDIR)$(DevIncludesdir)" +PROGRAMS = $(bin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -124,8 +136,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(whttrackrundir)" "$(DESTDIR)$(DevIncludesdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libhtsjava_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -165,7 +175,6 @@ libhttrack_la_OBJECTS = $(am_libhttrack_la_OBJECTS) libhttrack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhttrack_la_CFLAGS) \ $(CFLAGS) $(libhttrack_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(bin_PROGRAMS) am_htsserver_OBJECTS = htsserver-htsserver.$(OBJEXT) \ htsserver-htsweb.$(OBJEXT) htsserver_OBJECTS = $(am_htsserver_OBJECTS) @@ -205,7 +214,52 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/htsjava.Plo \ + ./$(DEPDIR)/htsserver-htsserver.Po \ + ./$(DEPDIR)/htsserver-htsweb.Po ./$(DEPDIR)/httrack.Po \ + ./$(DEPDIR)/libhttrack_la-htsalias.Plo \ + ./$(DEPDIR)/libhttrack_la-htsback.Plo \ + ./$(DEPDIR)/libhttrack_la-htsbauth.Plo \ + ./$(DEPDIR)/libhttrack_la-htscache.Plo \ + ./$(DEPDIR)/libhttrack_la-htscatchurl.Plo \ + ./$(DEPDIR)/libhttrack_la-htscharset.Plo \ + ./$(DEPDIR)/libhttrack_la-htsconcat.Plo \ + ./$(DEPDIR)/libhttrack_la-htscore.Plo \ + ./$(DEPDIR)/libhttrack_la-htscoremain.Plo \ + ./$(DEPDIR)/libhttrack_la-htsencoding.Plo \ + ./$(DEPDIR)/libhttrack_la-htsfilters.Plo \ + ./$(DEPDIR)/libhttrack_la-htsftp.Plo \ + ./$(DEPDIR)/libhttrack_la-htshash.Plo \ + ./$(DEPDIR)/libhttrack_la-htshelp.Plo \ + ./$(DEPDIR)/libhttrack_la-htsindex.Plo \ + ./$(DEPDIR)/libhttrack_la-htslib.Plo \ + ./$(DEPDIR)/libhttrack_la-htsmd5.Plo \ + ./$(DEPDIR)/libhttrack_la-htsmodules.Plo \ + ./$(DEPDIR)/libhttrack_la-htsname.Plo \ + ./$(DEPDIR)/libhttrack_la-htsparse.Plo \ + ./$(DEPDIR)/libhttrack_la-htsrobots.Plo \ + ./$(DEPDIR)/libhttrack_la-htsthread.Plo \ + ./$(DEPDIR)/libhttrack_la-htstools.Plo \ + ./$(DEPDIR)/libhttrack_la-htswizard.Plo \ + ./$(DEPDIR)/libhttrack_la-htswrap.Plo \ + ./$(DEPDIR)/libhttrack_la-htszlib.Plo \ + ./$(DEPDIR)/libhttrack_la-md5.Plo \ + ./$(DEPDIR)/libhttrack_la-punycode.Plo \ + ./$(DEPDIR)/proxytrack-htsmd5.Po ./$(DEPDIR)/proxytrack-md5.Po \ + coucal/$(DEPDIR)/libhttrack_la-coucal.Plo \ + coucal/$(DEPDIR)/proxytrack-coucal.Po \ + minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo \ + minizip/$(DEPDIR)/libhttrack_la-mztools.Plo \ + minizip/$(DEPDIR)/libhttrack_la-unzip.Plo \ + minizip/$(DEPDIR)/libhttrack_la-zip.Plo \ + minizip/$(DEPDIR)/proxytrack-ioapi.Po \ + minizip/$(DEPDIR)/proxytrack-mztools.Po \ + minizip/$(DEPDIR)/proxytrack-unzip.Po \ + minizip/$(DEPDIR)/proxytrack-zip.Po \ + proxy/$(DEPDIR)/proxytrack-main.Po \ + proxy/$(DEPDIR)/proxytrack-proxytrack.Po \ + proxy/$(DEPDIR)/proxytrack-store.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -254,6 +308,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -267,7 +322,6 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -286,7 +340,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -HAVE_VISIBILITY = @HAVE_VISIBILITY@ HTTPS_SUPPORT = @HTTPS_SUPPORT@ ICONV_LIBS = @ICONV_LIBS@ INSTALL = @INSTALL@ @@ -304,6 +357,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CV_OBJDIR = @LT_CV_OBJDIR@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -380,6 +434,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -503,14 +558,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -521,6 +575,55 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -584,55 +687,6 @@ minizip/libhttrack_la-zip.lo: minizip/$(am__dirstamp) \ libhttrack.la: $(libhttrack_la_OBJECTS) $(libhttrack_la_DEPENDENCIES) $(EXTRA_libhttrack_la_DEPENDENCIES) $(AM_V_CCLD)$(libhttrack_la_LINK) -rpath $(libdir) $(libhttrack_la_OBJECTS) $(libhttrack_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list htsserver$(EXEEXT): $(htsserver_OBJECTS) $(htsserver_DEPENDENCIES) $(EXTRA_htsserver_DEPENDENCIES) @rm -f htsserver$(EXEEXT) @@ -714,53 +768,59 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsjava.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsserver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsweb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httrack.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsalias.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsback.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsbauth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscatchurl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscharset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsconcat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscore.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscoremain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsencoding.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsfilters.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsftp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htshash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htshelp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsindex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htslib.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsmd5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsmodules.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsparse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsrobots.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsthread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htstools.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htswizard.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htswrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htszlib.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-md5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-punycode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsmd5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-md5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@coucal/$(DEPDIR)/libhttrack_la-coucal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@coucal/$(DEPDIR)/proxytrack-coucal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-mztools.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-unzip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-zip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-ioapi.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-mztools.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-unzip.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-zip.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-proxytrack.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-store.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsjava.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsserver.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver-htsweb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httrack.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsalias.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsback.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsbauth.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscatchurl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscharset.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsconcat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscore.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htscoremain.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsencoding.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsfilters.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsftp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htshash.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htshelp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsindex.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htslib.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsmd5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsmodules.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsparse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsrobots.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsthread.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htstools.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htswizard.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htswrap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htszlib.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-md5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-punycode.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsmd5.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-md5.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coucal/$(DEPDIR)/libhttrack_la-coucal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coucal/$(DEPDIR)/proxytrack-coucal.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-mztools.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-unzip.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-zip.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-ioapi.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-mztools.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-unzip.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-zip.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-proxytrack.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-store.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1266,7 +1326,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1298,11 +1361,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(whttrackrundir)" "$(DESTDIR)$(DevIncludesdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(whttrackrundir)" "$(DESTDIR)$(DevIncludesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1347,7 +1410,53 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) coucal/$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR) + -rm -f ./$(DEPDIR)/htsjava.Plo + -rm -f ./$(DEPDIR)/htsserver-htsserver.Po + -rm -f ./$(DEPDIR)/htsserver-htsweb.Po + -rm -f ./$(DEPDIR)/httrack.Po + -rm -f ./$(DEPDIR)/libhttrack_la-htsalias.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsback.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsbauth.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscache.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscatchurl.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscharset.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsconcat.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscore.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscoremain.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsencoding.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsfilters.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsftp.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htshash.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htshelp.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsindex.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htslib.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsmd5.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsmodules.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsname.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsparse.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsrobots.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsthread.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htstools.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htswizard.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htswrap.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htszlib.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-md5.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-punycode.Plo + -rm -f ./$(DEPDIR)/proxytrack-htsmd5.Po + -rm -f ./$(DEPDIR)/proxytrack-md5.Po + -rm -f coucal/$(DEPDIR)/libhttrack_la-coucal.Plo + -rm -f coucal/$(DEPDIR)/proxytrack-coucal.Po + -rm -f minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo + -rm -f minizip/$(DEPDIR)/libhttrack_la-mztools.Plo + -rm -f minizip/$(DEPDIR)/libhttrack_la-unzip.Plo + -rm -f minizip/$(DEPDIR)/libhttrack_la-zip.Plo + -rm -f minizip/$(DEPDIR)/proxytrack-ioapi.Po + -rm -f minizip/$(DEPDIR)/proxytrack-mztools.Po + -rm -f minizip/$(DEPDIR)/proxytrack-unzip.Po + -rm -f minizip/$(DEPDIR)/proxytrack-zip.Po + -rm -f proxy/$(DEPDIR)/proxytrack-main.Po + -rm -f proxy/$(DEPDIR)/proxytrack-proxytrack.Po + -rm -f proxy/$(DEPDIR)/proxytrack-store.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1393,7 +1502,53 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) coucal/$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR) + -rm -f ./$(DEPDIR)/htsjava.Plo + -rm -f ./$(DEPDIR)/htsserver-htsserver.Po + -rm -f ./$(DEPDIR)/htsserver-htsweb.Po + -rm -f ./$(DEPDIR)/httrack.Po + -rm -f ./$(DEPDIR)/libhttrack_la-htsalias.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsback.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsbauth.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscache.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscatchurl.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscharset.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsconcat.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscore.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htscoremain.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsencoding.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsfilters.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsftp.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htshash.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htshelp.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsindex.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htslib.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsmd5.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsmodules.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsname.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsparse.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsrobots.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htsthread.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htstools.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htswizard.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htswrap.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-htszlib.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-md5.Plo + -rm -f ./$(DEPDIR)/libhttrack_la-punycode.Plo + -rm -f ./$(DEPDIR)/proxytrack-htsmd5.Po + -rm -f ./$(DEPDIR)/proxytrack-md5.Po + -rm -f coucal/$(DEPDIR)/libhttrack_la-coucal.Plo + -rm -f coucal/$(DEPDIR)/proxytrack-coucal.Po + -rm -f minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo + -rm -f minizip/$(DEPDIR)/libhttrack_la-mztools.Plo + -rm -f minizip/$(DEPDIR)/libhttrack_la-unzip.Plo + -rm -f minizip/$(DEPDIR)/libhttrack_la-zip.Plo + -rm -f minizip/$(DEPDIR)/proxytrack-ioapi.Po + -rm -f minizip/$(DEPDIR)/proxytrack-mztools.Po + -rm -f minizip/$(DEPDIR)/proxytrack-unzip.Po + -rm -f minizip/$(DEPDIR)/proxytrack-zip.Po + -rm -f proxy/$(DEPDIR)/proxytrack-main.Po + -rm -f proxy/$(DEPDIR)/proxytrack-proxytrack.Po + -rm -f proxy/$(DEPDIR)/proxytrack-store.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1415,7 +1570,7 @@ uninstall-am: uninstall-DevIncludesDATA uninstall-binPROGRAMS \ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ @@ -1433,6 +1588,8 @@ uninstall-am: uninstall-DevIncludesDATA uninstall-binPROGRAMS \ uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ uninstall-whttrackrunSCRIPTS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/htslib.c b/src/htslib.c index 92c7d44..1df4765 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -115,6 +115,8 @@ const char *hts_detect[] = { "archive", "background", "data", // OBJECT + "data-src", + "data-srcset", "dynsrc", "lowsrc", "profile", // element META @@ -457,6 +459,28 @@ const char *hts_mime[][2] = { {"application/vnd.ms-works", "wdb"}, {"application/vnd.ms-works", "wks"}, {"application/vnd.ms-works", "wps"}, + {"application/vnd.oasis.opendocument.chart", "odc"}, + {"application/vnd.oasis.opendocument.database", "odb"}, + {"application/vnd.oasis.opendocument.formula", "odf"}, + {"application/vnd.oasis.opendocument.graphics", "odg"}, + {"application/vnd.oasis.opendocument.graphics-template", "otg"}, + {"application/vnd.oasis.opendocument.image", "odi"}, + {"application/vnd.oasis.opendocument.presentation", "odp"}, + {"application/vnd.oasis.opendocument.presentation-template", "otp"}, + {"application/vnd.oasis.opendocument.spreadsheet", "ods"}, + {"application/vnd.oasis.opendocument.spreadsheet-template", "ots"}, + {"application/vnd.oasis.opendocument.text", "odt"}, + {"application/vnd.oasis.opendocument.text-master", "odm"}, + {"application/vnd.oasis.opendocument.text-template", "ott"}, + {"application/vnd.oasis.opendocument.text-web", "oth"}, + {"application/vnd.openxmlformats-officedocument.presentationml.presentation", "pptx"}, + {"application/vnd.openxmlformats-officedocument.presentationml.slide", "sldx"}, + {"application/vnd.openxmlformats-officedocument.presentationml.slideshow", "ppsx"}, + {"application/vnd.openxmlformats-officedocument.presentationml.template", "potx"}, + {"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "xlsx"}, + {"application/vnd.openxmlformats-officedocument.spreadsheetml.template", "xltx"}, + {"application/vnd.openxmlformats-officedocument.wordprocessingml.document", "docx"}, + {"application/vnd.openxmlformats-officedocument.wordprocessingml.template", "dotx"}, {"application/x-compress", "z"}, {"application/x-compressed", "tgz"}, {"application/x-internet-signup", "ins"}, diff --git a/src/htsname.c b/src/htsname.c index d15e8a3..6443f55 100644 --- a/src/htsname.c +++ b/src/htsname.c @@ -901,6 +901,8 @@ int url_savename(lien_adrfilsave *const afs, strncatbuff(b, nom_pos, 8); } b += strlen(b); // pointer à la fin + *b = '.'; + ++b; // RECOPIE NOM + EXT *b = '\0'; if (dot_pos) { |