diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-04-23 21:06:35 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-04-23 21:06:35 +0000 |
| commit | a7259adba14345898e78b483b7620340ffa5cfc5 (patch) | |
| tree | e8d26c0981a666442ad4aa2fff5ddb87c5ce5866 /qpid/cpp/src/Makefile.am | |
| parent | 8d32b03448e8e1ba6319fc0ac484d0ab54b29b38 (diff) | |
| download | qpid-python-cmake.tar.gz | |
Merge in trunk changes from r758432:768028cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/cmake@768053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 3ac1992e2f..457463e72d 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -343,7 +343,6 @@ libqpidcommon_la_SOURCES = \ qpid/sys/AsynchIOHandler.cpp \ qpid/sys/Dispatcher.cpp \ qpid/sys/DispatchHandle.cpp \ - qpid/sys/LatencyMetric.cpp \ qpid/sys/Runnable.cpp \ qpid/sys/Shlib.cpp \ qpid/sys/Timer.cpp @@ -437,21 +436,26 @@ libqpidclient_la_SOURCES = \ qpid/client/Bounds.cpp \ qpid/client/Connection.cpp \ qpid/client/ConnectionHandler.cpp \ - qpid/client/ConnectionImpl.cpp \ + qpid/client/ConnectionImpl.cpp \ qpid/client/ConnectionSettings.cpp \ - qpid/client/Connector.cpp \ + qpid/client/Connector.cpp \ qpid/client/Demux.cpp \ qpid/client/Dispatcher.cpp \ - qpid/client/FailoverManager.cpp \ + qpid/client/FailoverManager.cpp \ qpid/client/FailoverListener.h \ qpid/client/FailoverListener.cpp \ qpid/client/Future.cpp \ qpid/client/FutureCompletion.cpp \ + qpid/client/Completion.cpp \ + qpid/client/CompletionImpl.h \ qpid/client/FutureResult.cpp \ qpid/client/HandlePrivate.h \ + qpid/client/PrivateImplPrivate.h \ qpid/client/LoadPlugins.cpp \ qpid/client/LocalQueue.cpp \ qpid/client/Message.cpp \ + qpid/client/MessageImpl.cpp \ + qpid/client/MessageImpl.h \ qpid/client/MessageListener.cpp \ qpid/client/MessageReplayTracker.cpp \ qpid/client/QueueOptions.cpp \ @@ -597,6 +601,7 @@ nobase_include_HEADERS = \ qpid/client/FutureCompletion.h \ qpid/client/FutureResult.h \ qpid/client/Handle.h \ + qpid/client/PrivateImpl.h \ qpid/client/LocalQueue.h \ qpid/client/QueueOptions.h \ qpid/client/Message.h \ @@ -697,7 +702,6 @@ nobase_include_HEADERS = \ qpid/sys/FileSysDir.h \ qpid/sys/IntegerTypes.h \ qpid/sys/IOHandle.h \ - qpid/sys/LatencyMetric.h \ qpid/sys/LockFile.h \ qpid/sys/LockPtr.h \ qpid/sys/Monitor.h \ |