TCP transport classes simplified

zmq_engine and tcp_socket merged into tcp_engine
zmq_connecter and tcp_connecter merged into tcp_connecter
zmq_listener and tcp_listener merged into tcp_listener

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b02e302..1354174 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,8 +60,8 @@ libzmq_la_SOURCES = \
     stdint.hpp \
     sub.hpp \
     tcp_connecter.hpp \
+    tcp_engine.hpp \
     tcp_listener.hpp \
-    tcp_socket.hpp \
     thread.hpp \
     trie.hpp \
     windows.hpp \
@@ -72,9 +72,6 @@ libzmq_la_SOURCES = \
     xsub.hpp \
     ypipe.hpp \
     yqueue.hpp \
-    zmq_connecter.hpp \
-    zmq_engine.hpp \
-    zmq_listener.hpp \
     clock.cpp \
     ctx.cpp \
     decoder.cpp \
@@ -116,8 +113,8 @@ libzmq_la_SOURCES = \
     socket_base.cpp \
     sub.cpp \
     tcp_connecter.cpp \
+    tcp_engine.cpp \
     tcp_listener.cpp \
-    tcp_socket.cpp \
     thread.cpp \
     trie.cpp \
     xpub.cpp \
@@ -125,9 +122,6 @@ libzmq_la_SOURCES = \
     xreq.cpp \
     xsub.cpp \
     zmq.cpp \
-    zmq_connecter.cpp \
-    zmq_engine.cpp \
-    zmq_listener.cpp \
     zmq_utils.cpp
 
 if ON_MINGW