From eaf99a69f4b09f05adba2039ccb9af046b16349a Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 31 Aug 2009 23:41:53 +0000 Subject: Working towards abstracting away the cross platform uuid mess: * Stop including indirectly from uuid.h in qpid/framing/Uuid.h and move inline definitions there into the implementation file git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@809781 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/src/Makefile.am') diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 3bfd405416..744e3b7a42 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -54,7 +54,7 @@ windows_dist = \ qpid/sys/windows/Time.cpp \ ../include/qpid/sys/windows/Time.h \ qpid/sys/windows/uuid.cpp \ - ../include/qpid/sys/windows/uuid.h \ + qpid/sys/windows/uuid.h \ windows/QpiddBroker.cpp \ qpid/broker/windows/BrokerDefaults.cpp \ qpid/broker/windows/SaslAuthenticator.cpp @@ -461,7 +461,8 @@ libqpidcommon_la_SOURCES += \ qpid/sys/Timer.cpp \ qpid/sys/Timer.h \ qpid/sys/Waitable.h \ - qpid/sys/alloca.h + qpid/sys/alloca.h \ + qpid/sys/uuid.h if HAVE_SASL libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h @@ -782,7 +783,6 @@ nobase_include_HEADERS += \ ../include/qpid/sys/SystemInfo.h \ ../include/qpid/sys/Thread.h \ ../include/qpid/sys/Time.h \ - ../include/qpid/sys/uuid.h \ ../include/qpid/messaging/Address.h \ ../include/qpid/messaging/Connection.h \ ../include/qpid/messaging/Codec.h \ -- cgit v1.2.1