diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 822a2c7..1ec11d4 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -1,30 +1,40 @@
-lib_LTLIBRARIES = libconcurrency.la \
-                     libthrift.la
+#lib_LTLIBRARIES = libthrift.la
+
+lib_LIBRARIES = libthrift.a
+
+common_cxxflags = -Isrc $(BOOST_CPPFLAGS)
+common_ldflags = $(BOOST_LDFLAGS)
 
 # Define the source file for the module
 
-libconcurrency_la_SOURCES = src/concurrency/Monitor.cc \
-                            src/concurrency/PosixThreadFactory.cc \
-                            src/concurrency/ThreadManager.cc \
-                            src/concurrency/TimerManager.cc
+libthrift_sources = src/concurrency/Monitor.cc \
+                    src/concurrency/PosixThreadFactory.cc \
+                    src/concurrency/ThreadManager.cc \
+                    src/concurrency/TimerManager.cc \
+	            src/protocol/TBinaryProtocol.cc \
+                    src/transport/TBufferedTransport.cc \
+                    src/transport/TChunkedTransport.cc \
+                    src/transport/TSocket.cc \
+                    src/transport/TServerSocket.cc \
+                    src/server/TSimpleServer.cc \
+                    src/server/TThreadPoolServer.cc
 
-libconcurrency_inst_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
+libthrift_a_SOURCES = $(libthrift_sources)
+#libthrift_la_SOURCES = $(libthrift_sources)
 
-libthrift_la_SOURCES = src/protocol/TBinaryProtocol.cc \
-                       src/transport/TBufferedTransport.cc \
-                       src/transport/TChunkedTransport.cc \
-                       src/transport/TSocket.cc \
-                       src/transport/TServerSocket.cc \
-                       src/server/TSimpleServer.cc
+libthrift_cxxflags =  $(common_cxxflags)
+libthrift_ldflags =  $(common_ldflags)
 
-libthrift_la_CXXFLAGS =  -Isrc
+libthrift_la_CXXFLAGS =  $(libthrift_cxxflags)
+libthrift_a_CXXFLAGS =  $(libthrift_cxxflags)
 
-libthrift_inst_headers = src/protocol/TBinaryProtocol.h \
+libthrift_inst_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/protocol/TBinaryProtocol.h \
                          src/protocol/TProtocol.h \
                          src/transport/TBufferedTransport.h \
                          src/transport/TChunkedTransport.h \
@@ -34,7 +44,9 @@
                          src/transport/TSocket.h \
                          src/transport/TTransport.h \
                          src/transport/TTransport.h \
-                         src/transport/TTransportException.h
+                         src/transport/TTransportException.h \
+                         src/server/TSimpleServer.h \
+                         src/server/TThreadPoolServer.h
 
 bin_PROGRAMS = concurrency_test
 
@@ -46,6 +58,7 @@
                            src/concurrency/test/ThreadManagerTests.h \
                            src/concurrency/test/TimerManagerTests.h
 
-concurrency_test_LDADD = libconcurrency.la
+concurrency_test_LDADD = libthrift.a
 
-concurrency_test_CXXFLAGS =  -Isrc/concurrency
+concurrency_test_CXXFLAGS =  $(common_cxxflags)
+concurrency_test_LDFLAGS =  $(common_ldflags)