Reordered public include files so they are now in include/amqpcpp/.

CMakeLists.txt

@@ -12,6 +12,9 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
 # ensure c++11 on all compilers
 set (CMAKE_CXX_STANDARD 11)
 
+# set include/ as include directory
+include_directories(${CMAKE_SOURCE_DIR}/include)
+
 macro (add_sources)
     file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
     foreach (_src ${ARGN})

src/basicdeliverframe.h

@@ -13,9 +13,9 @@
  *  Dependencies
  */
 #include "basicframe.h"
-#include "../include/stringfield.h"
-#include "../include/booleanset.h"
-#include "../include/connectionimpl.h"
+#include "amqpcpp/stringfield.h"
+#include "amqpcpp/booleanset.h"
+#include "amqpcpp/connectionimpl.h"
 
 /**
  *  Set up namespace

src/basicheaderframe.h

@@ -13,10 +13,10 @@
  *  Dependencies
  */
 #include "headerframe.h"
-#include "../include/metadata.h"
-#include "../include/envelope.h"
-#include "../include/connectionimpl.h"
-#include "../include/deferredconsumerbase.h"
+#include "amqpcpp/metadata.h"
+#include "amqpcpp/envelope.h"
+#include "amqpcpp/connectionimpl.h"
+#include "amqpcpp/deferredconsumerbase.h"
 
 /**
  *  Set up namespace

src/bodyframe.h

@@ -13,8 +13,8 @@
  *  Dependencies
  */
 #include "extframe.h"
-#include "../include/connectionimpl.h"
-#include "../include/deferredconsumerbase.h"
+#include "amqpcpp/connectionimpl.h"
+#include "amqpcpp/deferredconsumerbase.h"
 
 /**
  *  Set up namespace

src/deferredconsumerbase.cpp

@@ -10,7 +10,7 @@
 /**
  *  Dependencies
  */
-#include "../include/deferredconsumerbase.h"
+#include "amqpcpp/deferredconsumerbase.h"
 #include "basicdeliverframe.h"
 #include "basicgetokframe.h"
 #include "basicheaderframe.h"

src/extframe.h

@@ -19,8 +19,8 @@
 /**
  *  Dependencies
  */
-#include "../include/frame.h"
-#include "../include/receivedframe.h"
+#include "amqpcpp/frame.h"
+#include "amqpcpp/receivedframe.h"
 
 /**
  *  Set up namespace

src/includes.h

@@ -35,55 +35,55 @@
 #endif
 
 // forward declarations
-#include "../include/classes.h"
+#include "amqpcpp/classes.h"
 
 // utility classes
-#include "../include/endian.h"
-#include "../include/buffer.h"
-#include "../include/bytebuffer.h"
-#include "../include/receivedframe.h"
-#include "../include/outbuffer.h"
-#include "../include/copiedbuffer.h"
-#include "../include/watchable.h"
-#include "../include/monitor.h"
+#include "amqpcpp/endian.h"
+#include "amqpcpp/buffer.h"
+#include "amqpcpp/bytebuffer.h"
+#include "amqpcpp/receivedframe.h"
+#include "amqpcpp/outbuffer.h"
+#include "amqpcpp/copiedbuffer.h"
+#include "amqpcpp/watchable.h"
+#include "amqpcpp/monitor.h"
 
 // amqp types
-#include "../include/field.h"
-#include "../include/numericfield.h"
-#include "../include/decimalfield.h"
-#include "../include/stringfield.h"
-#include "../include/booleanset.h"
-#include "../include/fieldproxy.h"
-#include "../include/table.h"
-#include "../include/array.h"
+#include "amqpcpp/field.h"
+#include "amqpcpp/numericfield.h"
+#include "amqpcpp/decimalfield.h"
+#include "amqpcpp/stringfield.h"
+#include "amqpcpp/booleanset.h"
+#include "amqpcpp/fieldproxy.h"
+#include "amqpcpp/table.h"
+#include "amqpcpp/array.h"
 
 // envelope for publishing and consuming
-#include "../include/metadata.h"
-#include "../include/envelope.h"
-#include "../include/message.h"
+#include "amqpcpp/metadata.h"
+#include "amqpcpp/envelope.h"
+#include "amqpcpp/message.h"
 
 // mid level includes
-#include "../include/exchangetype.h"
-#include "../include/flags.h"
-#include "../include/callbacks.h"
-#include "../include/deferred.h"
-#include "../include/deferredconsumer.h"
-#include "../include/deferredqueue.h"
-#include "../include/deferreddelete.h"
-#include "../include/deferredcancel.h"
-#include "../include/deferredget.h"
-#include "../include/channelimpl.h"
-#include "../include/channel.h"
-#include "../include/login.h"
-#include "../include/address.h"
-#include "../include/connectionhandler.h"
-#include "../include/connectionimpl.h"
-#include "../include/connection.h"
+#include "amqpcpp/exchangetype.h"
+#include "amqpcpp/flags.h"
+#include "amqpcpp/callbacks.h"
+#include "amqpcpp/deferred.h"
+#include "amqpcpp/deferredconsumer.h"
+#include "amqpcpp/deferredqueue.h"
+#include "amqpcpp/deferreddelete.h"
+#include "amqpcpp/deferredcancel.h"
+#include "amqpcpp/deferredget.h"
+#include "amqpcpp/channelimpl.h"
+#include "amqpcpp/channel.h"
+#include "amqpcpp/login.h"
+#include "amqpcpp/address.h"
+#include "amqpcpp/connectionhandler.h"
+#include "amqpcpp/connectionimpl.h"
+#include "amqpcpp/connection.h"
 
 // classes that are very commonly used
-#include "../include/exception.h"
-#include "../include/protocolexception.h"
-#include "../include/frame.h"
+#include "amqpcpp/exception.h"
+#include "amqpcpp/protocolexception.h"
+#include "amqpcpp/frame.h"
 #include "extframe.h"
 #include "methodframe.h"
 #include "headerframe.h"

src/passthroughbuffer.h

@@ -17,7 +17,7 @@
  */
 #include <memory>
 #include <cstring>
-#include "../include/frame.h"
+#include "amqpcpp/frame.h"
 
 /**
  *  Set up namespace