1 files changed, 23 insertions, 20 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 19a80d0..86a6fbd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,16 +49,17 @@ endif
 
 nodist_libzmq_la_SOURCES = $(pgm_sources)
 
-libzmq_la_SOURCES = app_thread.hpp \
+libzmq_la_SOURCES = \
+    array.hpp \
     atomic_counter.hpp \
     atomic_ptr.hpp \
     blob.hpp \
     command.hpp \
     config.hpp \
+    connect_session.hpp \
     ctx.hpp \
     decoder.hpp \
     devpoll.hpp \
-    push.hpp \
     encoder.hpp \
     epoll.hpp \
     err.hpp \
@@ -69,18 +70,18 @@ libzmq_la_SOURCES = app_thread.hpp \
     io_object.hpp \
     io_thread.hpp \
     ip.hpp \
-    i_endpoint.hpp \
     i_engine.hpp \
     i_poll_events.hpp \
+    i_terminate_events.hpp \
     kqueue.hpp \
     lb.hpp \
     likely.hpp \
     msg_content.hpp \
-    msg_store.hpp \
     mutex.hpp \
+    named_session.hpp \
     object.hpp \
     options.hpp \
-    owned.hpp \
+    own.hpp \
     pgm_receiver.hpp \
     pgm_sender.hpp \
     pgm_socket.hpp \
@@ -89,43 +90,44 @@ libzmq_la_SOURCES = app_thread.hpp \
     poll.hpp \
     poller.hpp \
     pair.hpp \
-    prefix_tree.hpp \
     pub.hpp \
+    pull.hpp \
+    push.hpp \
     queue.hpp \
     rep.hpp \
     req.hpp \
     select.hpp \
+    semaphore.hpp \
     session.hpp \
     signaler.hpp \
     socket_base.hpp \
     stdint.hpp \
     streamer.hpp \
     sub.hpp \
+    swap.hpp \
     tcp_connecter.hpp \
     tcp_listener.hpp \
     tcp_socket.hpp \
     thread.hpp \
-    pull.hpp \
+    transient_session.hpp \
+    trie.hpp \
     uuid.hpp \
     windows.hpp \
     wire.hpp \
     xrep.hpp \
     xreq.hpp \
-    yarray.hpp \
-    yarray_item.hpp \
     ypipe.hpp \
     yqueue.hpp \
     zmq_connecter.hpp \
-    zmq_decoder.hpp \
-    zmq_encoder.hpp \
     zmq_engine.hpp \
     zmq_init.hpp \
     zmq_listener.hpp \
-    app_thread.cpp \
     command.cpp \
     ctx.cpp \
+    connect_session.cpp \
+    decoder.cpp \
     devpoll.cpp \
-    push.cpp \
+    encoder.cpp \
     epoll.cpp \
     err.cpp \
     forwarder.cpp \
@@ -135,17 +137,18 @@ libzmq_la_SOURCES = app_thread.hpp \
     ip.cpp \
     kqueue.cpp \
     lb.cpp \
-    msg_store.cpp \
+    named_session.cpp \
     object.cpp \
     options.cpp \
-    owned.cpp \
+    own.cpp \
+    pair.cpp \
     pgm_receiver.cpp \
     pgm_sender.cpp \
     pgm_socket.cpp \
-    pair.cpp \
-    prefix_tree.cpp \
     pipe.cpp \
     poll.cpp \
+    pull.cpp \
+    push.cpp \
     pub.cpp \
     queue.cpp \
     rep.cpp \
@@ -156,18 +159,18 @@ libzmq_la_SOURCES = app_thread.hpp \
     socket_base.cpp \
     streamer.cpp \
     sub.cpp \
+    swap.cpp \
     tcp_connecter.cpp \
     tcp_listener.cpp \
     tcp_socket.cpp \
     thread.cpp \
-    pull.cpp \
+    transient_session.cpp \
+    trie.cpp \
     uuid.cpp \
     xrep.cpp \
     xreq.cpp \
     zmq.cpp \
     zmq_connecter.cpp \
-    zmq_decoder.cpp \
-    zmq_encoder.cpp \
     zmq_engine.cpp \
     zmq_init.cpp \
     zmq_listener.cpp