summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_Con.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2016-12-07 13:34:28 -0200
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2016-12-10 08:44:06 -0200
commitf4306d654dc55e8a0449698da18f371644d656df (patch)
tree0fc90508f30cb10bb0a1d6e7e1bf942d97bfc23e /src/Makefile_Ecore_Con.am
parent72ad2c5eb7fbe8ceb491d1f545f82ae7cfc5457b (diff)
ecore_con: Ecore_Con_Server now on top of Efl_Net!
This is a major work and unfortunately couldn't be split into smaller pieces as old code was highly coupled. Ecore_Con_Server is now a wrapper around Efl_Net_Dialer_Simple (ecore_con_server_connect()) and Efl_Net_Server_Simple (ecore_con_server_add()), doing all that the original version did with some fixes so ecore_con_ssl_server_upgrade() and ecore_con_ssl_client_upgrade() are more usable -- see the examples and -t/--type=tcp+ssl. I tried to be bug-compatible, with code annotations where things doesn't make sense. This was based on ecore_con_suite tests and some manual experimenting with the examples, these can be helpful if you find regressions (report/assign to me).
Diffstat (limited to 'src/Makefile_Ecore_Con.am')
-rw-r--r--src/Makefile_Ecore_Con.am15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index c3e51ae441..1fc3ea5441 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -2,10 +2,6 @@
2### Library 2### Library
3 3
4ecore_con_eolian_files = \ 4ecore_con_eolian_files = \
5 lib/ecore_con/efl_network.eo \
6 lib/ecore_con/efl_network_client.eo \
7 lib/ecore_con/efl_network_server.eo \
8 lib/ecore_con/efl_network_connector.eo \
9 lib/ecore_con/efl_net_socket.eo \ 5 lib/ecore_con/efl_net_socket.eo \
10 lib/ecore_con/efl_net_socket_simple.eo \ 6 lib/ecore_con/efl_net_socket_simple.eo \
11 lib/ecore_con/efl_net_socket_fd.eo \ 7 lib/ecore_con/efl_net_socket_fd.eo \
@@ -71,7 +67,6 @@ lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
71installed_ecoreconmainheadersdir = $(includedir)/ecore-con-@VMAJ@ 67installed_ecoreconmainheadersdir = $(includedir)/ecore-con-@VMAJ@
72dist_installed_ecoreconmainheaders_DATA = \ 68dist_installed_ecoreconmainheaders_DATA = \
73lib/ecore_con/Ecore_Con.h \ 69lib/ecore_con/Ecore_Con.h \
74lib/ecore_con/Ecore_Con_Legacy.h \
75lib/ecore_con/Ecore_Con_Eo.h \ 70lib/ecore_con/Ecore_Con_Eo.h \
76lib/ecore_con/Ecore_Con_Eet.h \ 71lib/ecore_con/Ecore_Con_Eet.h \
77lib/ecore_con/Ecore_Con_Eet_Legacy.h \ 72lib/ecore_con/Ecore_Con_Eet_Legacy.h \
@@ -83,16 +78,15 @@ nodist_installed_ecoreconmainheaders_DATA = \
83lib_ecore_con_libecore_con_la_SOURCES = \ 78lib_ecore_con_libecore_con_la_SOURCES = \
84lib/ecore_con/ecore_con_alloc.c \ 79lib/ecore_con/ecore_con_alloc.c \
85lib/ecore_con/ecore_con.c \ 80lib/ecore_con/ecore_con.c \
81lib/ecore_con/ecore_con_legacy.c \
86lib/ecore_con/ecore_con_eet.c \ 82lib/ecore_con/ecore_con_eet.c \
87lib/ecore_con/ecore_con_socks.c \ 83lib/ecore_con/ecore_con_socks.c \
88lib/ecore_con/ecore_con_ssl.c \
89lib/ecore_con/ecore_con_url.c \ 84lib/ecore_con/ecore_con_url.c \
90lib/ecore_con/ecore_con_url_curl.c \ 85lib/ecore_con/ecore_con_url_curl.c \
91lib/ecore_con/ecore_con_url_curl.h \ 86lib/ecore_con/ecore_con_url_curl.h \
92static_libs/http-parser/http_parser.c \ 87static_libs/http-parser/http_parser.c \
93static_libs/http-parser/http_parser.h \ 88static_libs/http-parser/http_parser.h \
94lib/ecore_con/ecore_con_private.h \ 89lib/ecore_con/ecore_con_private.h \
95lib/ecore_con/ecore_con_info.c \
96lib/ecore_con/efl_net_socket.c \ 90lib/ecore_con/efl_net_socket.c \
97lib/ecore_con/efl_net_socket_simple.c \ 91lib/ecore_con/efl_net_socket_simple.c \
98lib/ecore_con/efl_net_socket_fd.c \ 92lib/ecore_con/efl_net_socket_fd.c \
@@ -113,7 +107,8 @@ lib/ecore_con/efl_net_server_udp_client.c \
113lib/ecore_con/efl_net_socket_ssl.c \ 107lib/ecore_con/efl_net_socket_ssl.c \
114lib/ecore_con/efl_net_ssl_context.c \ 108lib/ecore_con/efl_net_ssl_context.c \
115lib/ecore_con/efl_net_dialer_ssl.c \ 109lib/ecore_con/efl_net_dialer_ssl.c \
116lib/ecore_con/efl_net_server_ssl.c 110lib/ecore_con/efl_net_server_ssl.c \
111lib/ecore_con/ecore_con_local.c
117 112
118if EFL_NET_CONTROL_BACKEND_CONNMAN 113if EFL_NET_CONTROL_BACKEND_CONNMAN
119lib_ecore_con_libecore_con_la_SOURCES += \ 114lib_ecore_con_libecore_con_la_SOURCES += \
@@ -146,9 +141,9 @@ lib/ecore_con/efl_net_ssl_ctx-gnutls.c \
146lib/ecore_con/efl_net_ssl_ctx-none.c 141lib/ecore_con/efl_net_ssl_ctx-none.c
147 142
148if HAVE_WINDOWS 143if HAVE_WINDOWS
149lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local_win32.c 144#lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local_win32.c
150else 145else
151lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local.c \ 146lib_ecore_con_libecore_con_la_SOURCES += \
152lib/ecore_con/efl_net_socket_unix.c \ 147lib/ecore_con/efl_net_socket_unix.c \
153lib/ecore_con/efl_net_dialer_unix.c \ 148lib/ecore_con/efl_net_dialer_unix.c \
154lib/ecore_con/efl_net_server_unix.c 149lib/ecore_con/efl_net_server_unix.c