Commit ec49d03a authored by Kartik Mistry's avatar Kartik Mistry 🇮🇳

Imported Upstream version 1.15.1

parent 360b4dc6
This diff is collapsed.
SUBDIRS = po intl lib deps src test doc
SUBDIRS = po intl lib deps src doc test
ACLOCAL_AMFLAGS = -I m4 --install
EXTRA_DIST = config.rpath
dist_doc_DATA = README README.asciidoc README.html
dist_doc_DATA = README README.rst README.html
dist_noinst_DATA = LICENSE.OpenSSL
if HAVE_ASCIIDOC
README.html: README.asciidoc
@ASCIIDOC@ -d article -b xhtml11 -n README.asciidoc
endif # HAVE_ASCIIDOC
\ No newline at end of file
README.html: README.rst
rst2html README.rst > README.html
......@@ -314,6 +314,7 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bashcompletiondir = @bashcompletiondir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
......@@ -360,10 +361,10 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = po intl lib deps src test doc
SUBDIRS = po intl lib deps src doc test
ACLOCAL_AMFLAGS = -I m4 --install
EXTRA_DIST = config.rpath
dist_doc_DATA = README README.asciidoc README.html
dist_doc_DATA = README README.rst README.html
dist_noinst_DATA = LICENSE.OpenSSL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......@@ -903,8 +904,8 @@ uninstall-am: uninstall-dist_docDATA
uninstall uninstall-am uninstall-dist_docDATA
@HAVE_ASCIIDOC_TRUE@README.html: README.asciidoc
@HAVE_ASCIIDOC_TRUE@ @ASCIIDOC@ -d article -b xhtml11 -n README.asciidoc
README.html: README.rst
rst2html README.rst > README.html
# 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.
......
aria2 1.15.1
============
Release Note
------------
This release fixes the bug that prevents --bt-lpd-interface from
working. If some options sent by RPC request are not acceptable for
the download type, they are now simply ignored instead of rejecting
RPC request entirely. The aria2 RPC server now returns 4XX error code
if the request is not valid in the HTTP level. To improve packaging,
--with-bashcompletiondir configure option was added. This option
overrides where the aria2c bash_completion file is going to be
installed. All manual pages are now generated by Sphinx.
Changes
-------
* Return appropriate HTTP status code on RPC failure. In this change,
we return 404 if the request path is neither /json-rpc nor /rpc. If
XML feature is not enabled and /rpc is requested, return 404. If
XML parser failed, return 400. JSON parser failure has been handled
well in the existing code.
* Ignore unacceptable options in RPC request instead of throwing
error. This change allows RPC client to send same options for the
different type of downloads.
* Handle sockaddr_in.sin_len and sockaddr_in6.sin6_len. Check
sockaddr_in.sin_len and sockaddr_in6.sin6_len are available and
assign values to them properly. This change fixes unit test error
and most error related to getnameinfo() on netbsd.
* Removed dependency on inet_aton. Implemented inetPton as a
replacement of inet_aton. inetPton is implemented using
net::getBinAddr. This change fixes bug#3525424.
* Added --with-bashcompletiondir configure option. By default,
bash_completion file named aria2c is installed to the directory
$prefix/share/doc/aria2/bash_completion. To change the install
directory of the file, use --with-bashcompletiondir option.
* Converted README.asciidoc into README.rst
* Use Sphinx for aria2 manual page documentation. The source files
for manual pages are placed under doc/manual-src. The manual pages
are generated under doc/manual-src/$LANG/_build. The HTML version
manual page was dropped from the distribution archive.
* Fixed the bug which prevents --bt-lpd-interface from working.
Fixes bug#3520125
aria2 1.15.0
============
......
See README.asciidoc
See README.rst
This diff is collapsed.
This diff is collapsed.
......@@ -210,9 +210,6 @@
/* Define to 1 if you have the <ifaddrs.h> header file. */
#undef HAVE_IFADDRS_H
/* Define to 1 if you have the `inet_aton' function. */
#undef HAVE_INET_ATON
/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
#undef HAVE_INTMAX_T
......@@ -391,6 +388,9 @@
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if struct sockaddr_in6 has sin6_len member. */
#undef HAVE_SOCKADDR_IN6_SIN6_LEN
/* Define to 1 if struct sockaddr_in has sin_len member. */
#undef HAVE_SOCKADDR_IN_SIN_LEN
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for aria2 1.15.0.
# Generated by GNU Autoconf 2.68 for aria2 1.15.1.
#
# Report bugs to <t-tujikawa@users.sourceforge.net>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='aria2'
PACKAGE_TARNAME='aria2'
PACKAGE_VERSION='1.15.0'
PACKAGE_STRING='aria2 1.15.0'
PACKAGE_VERSION='1.15.1'
PACKAGE_STRING='aria2 1.15.1'
PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net'
PACKAGE_URL='http://aria2.sourceforge.net/'
......@@ -620,6 +620,7 @@ enable_option_checking=no
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
bashcompletiondir
ENABLE_WEBSOCKET_FALSE
ENABLE_WEBSOCKET_TRUE
subdirs
......@@ -643,8 +644,6 @@ HAVE_STRPTIME_FALSE
HAVE_STRPTIME_TRUE
HAVE_LOCALTIME_R_FALSE
HAVE_LOCALTIME_R_TRUE
HAVE_INET_ATON_FALSE
HAVE_INET_ATON_TRUE
HAVE_GETTIMEOFDAY_FALSE
HAVE_GETTIMEOFDAY_TRUE
HAVE_GETADDRINFO_FALSE
......@@ -919,6 +918,7 @@ enable_bittorrent
enable_metalink
enable_epoll
with_ca_bundle
with_bashcompletiondir
with_xml_prefix
with_xml_exec_prefix
enable_xmltest
......@@ -1502,7 +1502,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures aria2 1.15.0 to adapt to many kinds of systems.
\`configure' configures aria2 1.15.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1573,7 +1573,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of aria2 1.15.0:";;
short | recursive ) echo "Configuration of aria2 1.15.1:";;
esac
cat <<\_ACEOF
......@@ -1620,6 +1620,8 @@ Optional Packages:
--with-libcares Use libcares if it is installed.
--with-libz Use libz if it is installed.
--with-ca-bundle=FILE Use FILE as default CA bundle.
--with-bashcompletiondir=DIR
Directory to install bash_completion file
--with-xml-prefix=PFX Prefix where libxml is installed (optional)
--with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
--with-libgcrypt-prefix=PFX
......@@ -1742,7 +1744,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
aria2 configure 1.15.0
aria2 configure 1.15.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2879,7 +2881,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by aria2 $as_me 1.15.0, which was
It was created by aria2 $as_me 1.15.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -12253,7 +12255,7 @@ fi
# Define the identity of the package.
PACKAGE='aria2'
VERSION='1.15.0'
VERSION='1.15.1'
cat >>confdefs.h <<_ACEOF
......@@ -12705,6 +12707,15 @@ else
fi
# Check whether --with-bashcompletiondir was given.
if test "${with_bashcompletiondir+set}" = set; then :
withval=$with_bashcompletiondir; bashcompletiondir=$withval
else
bashcompletiondir=$docdir/bash_completion
fi
# Checks for programs.
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
......@@ -18838,62 +18849,6 @@ ac_res=$ac_cv_search_getaddrinfo
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
$as_echo_n "checking for library containing inet_aton... " >&6; }
if ${ac_cv_search_inet_aton+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char inet_aton ();
int
main ()
{
return inet_aton ();
;
return 0;
}
_ACEOF
for ac_lib in '' nsl socket; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_cxx_try_link "$LINENO"; then :
ac_cv_search_inet_aton=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_inet_aton+:} false; then :
break
fi
done
if ${ac_cv_search_inet_aton+:} false; then :
else
ac_cv_search_inet_aton=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
$as_echo "$ac_cv_search_inet_aton" >&6; }
ac_res=$ac_cv_search_inet_aton
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
;;
......@@ -26632,33 +26587,6 @@ fi
fi
done
for ac_func in inet_aton
do :
ac_fn_cxx_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
if test "x$ac_cv_func_inet_aton" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_INET_ATON 1
_ACEOF
if true; then
HAVE_INET_ATON_TRUE=
HAVE_INET_ATON_FALSE='#'
else
HAVE_INET_ATON_TRUE='#'
HAVE_INET_ATON_FALSE=
fi
else
if false; then
HAVE_INET_ATON_TRUE=
HAVE_INET_ATON_FALSE='#'
else
HAVE_INET_ATON_TRUE='#'
HAVE_INET_ATON_FALSE=
fi
fi
done
for ac_func in localtime_r
do :
ac_fn_cxx_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
......@@ -26946,7 +26874,11 @@ $as_echo "#define KEVENT_UDATA_INTPTR_T 1" >>confdefs.h
fi
fi
ac_fn_cxx_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#include <netinet/in.h>
ac_fn_cxx_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
"
if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then :
......@@ -26955,6 +26887,19 @@ $as_echo "#define HAVE_SOCKADDR_IN_SIN_LEN 1" >>confdefs.h
fi
ac_fn_cxx_check_member "$LINENO" "struct sockaddr_in6" "sin6_len" "ac_cv_member_struct_sockaddr_in6_sin6_len" "
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
"
if test "x$ac_cv_member_struct_sockaddr_in6_sin6_len" = xyes; then :
$as_echo "#define HAVE_SOCKADDR_IN6_SIN6_LEN 1" >>confdefs.h
fi
# Check struct option.name is assignable from const char*. struct
# option.name in opensolaris is of type char*. In Linux, it is const
# char*
......@@ -27014,7 +26959,9 @@ else
fi
ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile po/Makefile.in intl/Makefile lib/Makefile doc/Makefile doc/ru/Makefile deps/Makefile"
ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile po/Makefile.in intl/Makefile lib/Makefile doc/Makefile doc/manual-src/Makefile doc/manual-src/en/Makefile doc/manual-src/en/conf.py doc/manual-src/ru/Makefile doc/manual-src/ru/conf.py deps/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -27286,14 +27233,6 @@ if test -z "${HAVE_GETTIMEOFDAY_TRUE}" && test -z "${HAVE_GETTIMEOFDAY_FALSE}";
as_fn_error $? "conditional \"HAVE_GETTIMEOFDAY\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_INET_ATON_TRUE}" && test -z "${HAVE_INET_ATON_FALSE}"; then
as_fn_error $? "conditional \"HAVE_INET_ATON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_INET_ATON_TRUE}" && test -z "${HAVE_INET_ATON_FALSE}"; then
as_fn_error $? "conditional \"HAVE_INET_ATON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LOCALTIME_R_TRUE}" && test -z "${HAVE_LOCALTIME_R_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LOCALTIME_R\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
......@@ -27775,7 +27714,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by aria2 $as_me 1.15.0, which was
This file was extended by aria2 $as_me 1.15.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -27842,7 +27781,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
aria2 config.status 1.15.0
aria2 config.status 1.15.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
......@@ -28364,7 +28303,11 @@ do
"intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/ru/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;;
"doc/manual-src/Makefile") CONFIG_FILES="$CONFIG_FILES doc/manual-src/Makefile" ;;
"doc/manual-src/en/Makefile") CONFIG_FILES="$CONFIG_FILES doc/manual-src/en/Makefile" ;;
"doc/manual-src/en/conf.py") CONFIG_FILES="$CONFIG_FILES doc/manual-src/en/conf.py" ;;
"doc/manual-src/ru/Makefile") CONFIG_FILES="$CONFIG_FILES doc/manual-src/ru/Makefile" ;;
"doc/manual-src/ru/conf.py") CONFIG_FILES="$CONFIG_FILES doc/manual-src/ru/conf.py" ;;
"deps/Makefile") CONFIG_FILES="$CONFIG_FILES deps/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
......@@ -30174,3 +30117,4 @@ echo "Metalink: $enable_metalink"
echo "XML-RPC: $enable_xml_rpc"
echo "Message Digest: $enable_message_digest"
echo "WebSocket: $enable_websocket"
echo "bash_completion dir: $bashcompletiondir"
......@@ -3,7 +3,7 @@
#
AC_PREREQ([2.67])
LT_PREREQ([2.2.6])
AC_INIT([aria2],[1.15.0],[t-tujikawa@users.sourceforge.net],[aria2],[http://aria2.sourceforge.net/])
AC_INIT([aria2],[1.15.1],[t-tujikawa@users.sourceforge.net],[aria2],[http://aria2.sourceforge.net/])
AC_USE_SYSTEM_EXTENSIONS
LT_INIT()
AC_CONFIG_MACRO_DIR([m4])
......@@ -43,6 +43,11 @@ AC_ARG_WITH([ca-bundle],
AS_HELP_STRING([--with-ca-bundle=FILE],[Use FILE as default CA bundle.]),
[ca_bundle=$withval], [ca_bundle=""])
AC_ARG_WITH([bashcompletiondir],
AS_HELP_STRING([--with-bashcompletiondir=DIR],
[Directory to install bash_completion file]),
[bashcompletiondir=$withval], [bashcompletiondir=$docdir/bash_completion])
# Checks for programs.
AC_PROG_CXX
AC_PROG_CC
......@@ -299,7 +304,6 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
case "$target" in
*solaris*)
AC_SEARCH_LIBS([getaddrinfo], [nsl socket])
AC_SEARCH_LIBS([inet_aton], [nsl socket])
;;
esac
......@@ -470,9 +474,6 @@ AC_CHECK_FUNCS([getaddrinfo],
AC_CHECK_FUNCS([gettimeofday],
[AM_CONDITIONAL([HAVE_GETTIMEOFDAY], true)],
[AM_CONDITIONAL([HAVE_GETTIMEOFDAY], false)])
AC_CHECK_FUNCS([inet_aton],
[AM_CONDITIONAL([HAVE_INET_ATON], true)],
[AM_CONDITIONAL([HAVE_INET_ATON], false)])
AC_CHECK_FUNCS([localtime_r],
[AM_CONDITIONAL([HAVE_LOCALTIME_R], true)],
[AM_CONDITIONAL([HAVE_LOCALTIME_R], false)])
......@@ -540,7 +541,21 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
[AC_DEFINE([HAVE_SOCKADDR_IN_SIN_LEN],[1],
[Define to 1 if struct sockaddr_in has sin_len member.])],
[],
[[#include <netinet/in.h>]])
[[
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
]])
AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len],
[AC_DEFINE([HAVE_SOCKADDR_IN6_SIN6_LEN],[1],
[Define to 1 if struct sockaddr_in6 has sin6_len member.])],
[],
[[
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
]])
# Check struct option.name is assignable from const char*. struct
# option.name in opensolaris is of type char*. In Linux, it is const
......@@ -572,6 +587,8 @@ if test "x$enable_message_digest" = "xyes"; then
fi
AM_CONDITIONAL([ENABLE_WEBSOCKET], [test "x$enable_websocket" = "xyes"])
AC_SUBST([bashcompletiondir])
AC_CONFIG_FILES([Makefile
src/Makefile
test/Makefile
......@@ -579,7 +596,11 @@ AC_CONFIG_FILES([Makefile
intl/Makefile
lib/Makefile
doc/Makefile
doc/ru/Makefile
doc/manual-src/Makefile
doc/manual-src/en/Makefile
doc/manual-src/en/conf.py
doc/manual-src/ru/Makefile
doc/manual-src/ru/conf.py
deps/Makefile])
AC_OUTPUT
......@@ -607,3 +628,4 @@ echo "Metalink: $enable_metalink"
echo "XML-RPC: $enable_xml_rpc"
echo "Message Digest: $enable_message_digest"
echo "WebSocket: $enable_websocket"
echo "bash_completion dir: $bashcompletiondir"
......@@ -263,6 +263,7 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bashcompletiondir = @bashcompletiondir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
......
......@@ -20,4 +20,4 @@
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
EXTRA_DIST = wslay/wslay.h wslay/wslayver.h
noinst_HEADERS = wslay/wslay.h wslay/wslayver.h
......@@ -29,6 +29,7 @@
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
......@@ -50,7 +51,8 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = lib/includes
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
......@@ -64,6 +66,9 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -194,7 +199,7 @@ top_srcdir = @top_srcdir@
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
EXTRA_DIST = wslay/wslay.h wslay/wslayver.h
noinst_HEADERS = wslay/wslay.h wslay/wslayver.h
all: all-am
.SUFFIXES:
......@@ -234,12 +239,58 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS:
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: CTAGS
CTAGS:
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......@@ -273,7 +324,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
all-am: Makefile
all-am: Makefile $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
......@@ -311,7 +362,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-generic
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-am
......@@ -373,16 +424,18 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool ctags distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
SUBDIRS = ru
man_MANS = aria2c.1
EXTRA_DIST = $(man_MANS)
dist_doc_DATA = aria2c.1.html aria2c.1.asciidoc
SUBDIRS = manual-src
doc_xmlrpcdir = $(docdir)/xmlrpc
dist_doc_xmlrpc_DATA = xmlrpc/aria2mon \
xmlrpc/aria2rpc \
xmlrpc/README.txt
doc_bashcompletiondir = $(docdir)/bash_completion
dist_doc_bashcompletion_DATA = bash_completion/README.txt \
bash_completion/aria2c
if HAVE_A2X
aria2c.1: aria2c.1.asciidoc
@A2X@ -f manpage aria2c.1.asciidoc
endif # HAVE_A2X
doc_bashcompletiondir = $(docdir)/bash_completion
dist_doc_bashcompletion_DATA = bash_completion/README.txt
if HAVE_ASCIIDOC
aria2c.1.html: aria2c.1.asciidoc
@ASCIIDOC@ -d manpage -b xhtml11 -a toc -a max-width=55em aria2c.1.asciidoc
endif # HAVE_ASCIIDOC
doc_bashcompletionscriptdir = @bashcompletiondir@
dist_doc_bashcompletionscript_DATA = bash_completion/aria2c
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# Makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter