More boosification of thrift driver, server, transport and protocol code
Modified TestServer to use thread-pool manager
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664737 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 1ec11d4..cee5327 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -1,6 +1,5 @@
-#lib_LTLIBRARIES = libthrift.la
-
-lib_LIBRARIES = libthrift.a
+lib_LTLIBRARIES = libthrift.la
+#lib_LIBRARIES = libthrift.a
common_cxxflags = -Isrc $(BOOST_CPPFLAGS)
common_ldflags = $(BOOST_LDFLAGS)
@@ -19,8 +18,8 @@
src/server/TSimpleServer.cc \
src/server/TThreadPoolServer.cc
-libthrift_a_SOURCES = $(libthrift_sources)
-#libthrift_la_SOURCES = $(libthrift_sources)
+#libthrift_a_SOURCES = $(libthrift_sources)
+libthrift_la_SOURCES = $(libthrift_sources)
libthrift_cxxflags = $(common_cxxflags)
libthrift_ldflags = $(common_ldflags)
@@ -28,14 +27,27 @@
libthrift_la_CXXFLAGS = $(libthrift_cxxflags)
libthrift_a_CXXFLAGS = $(libthrift_cxxflags)
-libthrift_inst_headers = src/concurrency/Exception.h \
+include_thriftdir = $(includedir)/thrift
+include_thrift_HEADERS = \
+ src/Thrift.h \
+ src/TProcessor.h
+
+include_concurrencydir = $(includedir)/thrift/concurrency
+include_concurrency_HEADERS = \
+ src/concurrency/Exception.h \
src/concurrency/Monitor.h \
src/concurrency/PosixThreadFactory.h \
src/concurrency/Thread.h \
src/concurrency/ThreadManager.h \
- src/concurrency/TimerManager.h \
+ src/concurrency/TimerManager.h
+
+include_protocoldir = $(includedir)/thrift/protocol
+include_protocol_HEADERS = \
src/protocol/TBinaryProtocol.h \
- src/protocol/TProtocol.h \
+ src/protocol/TProtocol.h
+
+include_transportdir = $(includedir)/thrift/transport
+include_transport_HEADERS = \
src/transport/TBufferedTransport.h \
src/transport/TChunkedTransport.h \
src/transport/TNullTransport.h \
@@ -43,16 +55,16 @@
src/transport/TServerTransport.h \
src/transport/TSocket.h \
src/transport/TTransport.h \
- src/transport/TTransport.h \
- src/transport/TTransportException.h \
+ src/transport/TTransportException.h
+
+include_serverdir = $(includedir)/thrift/server
+include_server_HEADERS = \
+ src/server/TServer.h \
src/server/TSimpleServer.h \
src/server/TThreadPoolServer.h
bin_PROGRAMS = concurrency_test
-include_HEADERS = $(libconcurrency_inst_headers) \
- $(libthrift_inst_headers)
-
concurrency_test_SOURCES = src/concurrency/test/Tests.cc \
src/concurrency/test/ThreadFactoryTests.h \
src/concurrency/test/ThreadManagerTests.h \