From 4f24deac448c648d0b514acefd8bbb8721c9fe04 Mon Sep 17 00:00:00 2001 From: Srivardhan Hebbar Date: Tue, 10 Nov 2015 14:01:03 -0800 Subject: [PATCH] ecore_con: Moving dns.c and dns.h to static_libs. Summary: Took the license file from https://github.com/wahern/dns The dns.c and dns.h are taken from here. Signed-off-by: Srivardhan Hebbar Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3314 --- COPYING | 1 + licenses/COPYING.DNS | 19 +++++++++++++++++++ src/Makefile_Ecore_Con.am | 8 +++++++- src/{lib/ecore_con => static_libs/dns}/dns.c | 0 src/{lib/ecore_con => static_libs/dns}/dns.h | 0 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 licenses/COPYING.DNS rename src/{lib/ecore_con => static_libs/dns}/dns.c (100%) rename src/{lib/ecore_con => static_libs/dns}/dns.h (100%) diff --git a/COPYING b/COPYING index 77e6f464bf..205c98b433 100644 --- a/COPYING +++ b/COPYING @@ -21,6 +21,7 @@ ector: licenses/COPYING.FTL, licenses/COPYING.GPL (dual licenses) evas: licenses/COPYING.BSD embryo: licenses/COPYING.SMALL ecore: licenses/COPYING.BSD +dns: licenses/COPYING.DNS eio: licenses/COPYING.LGPL eldbus: licenses/COPYING.LGPL efreet: licenses/COPYING.BSD diff --git a/licenses/COPYING.DNS b/licenses/COPYING.DNS new file mode 100644 index 0000000000..ee15b155bf --- /dev/null +++ b/licenses/COPYING.DNS @@ -0,0 +1,19 @@ +Copyright (c) 2008-2015 William Ahern + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE 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. diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index 25569ab295..4e109cad7e 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -69,7 +69,9 @@ if HAVE_CARES lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_ares.c else if HAVE_IPV6 -lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_dns.c lib/ecore_con/dns.c lib/ecore_con/dns.h +lib_ecore_con_libecore_con_la_SOURCES += \ +lib/ecore_con/ecore_con_dns.c \ +static_libs/dns/dns.c else lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c endif @@ -82,6 +84,10 @@ lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser +if HAVE_IPV6 +lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/dns/ +endif + EXTRA_DIST += \ tests/ecore_con/server.key \ tests/ecore_con/server.pem \ diff --git a/src/lib/ecore_con/dns.c b/src/static_libs/dns/dns.c similarity index 100% rename from src/lib/ecore_con/dns.c rename to src/static_libs/dns/dns.c diff --git a/src/lib/ecore_con/dns.h b/src/static_libs/dns/dns.h similarity index 100% rename from src/lib/ecore_con/dns.h rename to src/static_libs/dns/dns.h