diff options
author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:24:08 +0900 |
---|---|---|
committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:25:02 +0900 |
commit | 8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8 (patch) | |
tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /Makefile.inc | |
parent | ccccebb78520ec3a26a18370936516b12ae5d53a (diff) | |
parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
download | c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.tar.gz c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.tar.bz2 c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.zip |
Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019
Conflicts:
packaging/c-ares.spec
Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
Diffstat (limited to 'Makefile.inc')
-rw-r--r-- | Makefile.inc | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/Makefile.inc b/Makefile.inc index c38c921..22580b7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -82,6 +82,7 @@ MANPAGES = ares_cancel.3 \ ares_free_hostent.3 \ ares_free_string.3 \ ares_get_servers.3 \ + ares_get_servers_ports.3 \ ares_gethostbyaddr.3 \ ares_gethostbyname.3 \ ares_gethostbyname_file.3 \ @@ -107,8 +108,16 @@ MANPAGES = ares_cancel.3 \ ares_save_options.3 \ ares_search.3 \ ares_send.3 \ + ares_set_local_dev.3 \ + ares_set_local_ip4.3 \ + ares_set_local_ip6.3 \ ares_set_servers.3 \ + ares_set_servers_csv.3 \ + ares_set_servers_ports.3 \ + ares_set_servers_ports_csv.3 \ ares_set_socket_callback.3 \ + ares_set_socket_configure_callback.3 \ + ares_set_sortlist.3 \ ares_strerror.3 \ ares_timeout.3 \ ares_version.3 \ @@ -126,6 +135,7 @@ HTMLPAGES = ares_cancel.html \ ares_free_hostent.html \ ares_free_string.html \ ares_get_servers.html \ + ares_get_servers_ports.html \ ares_gethostbyaddr.html \ ares_gethostbyname.html \ ares_gethostbyname_file.html \ @@ -150,8 +160,16 @@ HTMLPAGES = ares_cancel.html \ ares_save_options.html \ ares_search.html \ ares_send.html \ + ares_set_local_dev.html \ + ares_set_local_ip4.html \ + ares_set_local_ip6.html \ ares_set_servers.html \ + ares_set_servers_csv.html \ + ares_set_servers_ports.html \ + ares_set_servers_ports_csv.html \ ares_set_socket_callback.html \ + ares_set_socket_configure_callback.html \ + ares_set_sortlist.html \ ares_strerror.html \ ares_timeout.html \ ares_version.html \ @@ -169,6 +187,7 @@ PDFPAGES = ares_cancel.pdf \ ares_free_hostent.pdf \ ares_free_string.pdf \ ares_get_servers.pdf \ + ares_get_servers_ports.pdf \ ares_gethostbyaddr.pdf \ ares_gethostbyname.pdf \ ares_gethostbyname_file.pdf \ @@ -193,8 +212,16 @@ PDFPAGES = ares_cancel.pdf \ ares_save_options.pdf \ ares_search.pdf \ ares_send.pdf \ + ares_set_local_dev.pdf \ + ares_set_local_ip4.pdf \ + ares_set_local_ip6.pdf \ ares_set_servers.pdf \ + ares_set_servers_csv.pdf \ + ares_set_servers_ports.pdf \ + ares_set_servers_ports_csv.pdf \ ares_set_socket_callback.pdf \ + ares_set_socket_configure_callback.pdf \ + ares_set_sortlist.pdf \ ares_strerror.pdf \ ares_timeout.pdf \ ares_version.pdf \ |