From 014fa22114f19ee14d1a8054280b3accb5862c3b Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Tue, 11 Aug 2015 16:28:45 +1000
Subject: [PATCH] AP_SerialManager: standardize inclusion of libaries headers

This commit changes the way libraries headers are included in source files:

 - If the header is in the same directory the source belongs to, so the
 notation '#include ""' is used with the path relative to the directory
 containing the source.

 - If the header is outside the directory containing the source, then we use
 the notation '#include <>' with the path relative to libraries folder.

Some of the advantages of such approach:

 - Only one search path for libraries headers.

 - OSs like Windows may have a better lookup time.
---
 libraries/AP_SerialManager/AP_SerialManager.cpp | 4 ++--
 libraries/AP_SerialManager/AP_SerialManager.h   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/AP_SerialManager/AP_SerialManager.cpp b/libraries/AP_SerialManager/AP_SerialManager.cpp
index 94b81e8d89..449d0236da 100644
--- a/libraries/AP_SerialManager/AP_SerialManager.cpp
+++ b/libraries/AP_SerialManager/AP_SerialManager.cpp
@@ -21,8 +21,8 @@
   find which serial port they should use
  */
 
-#include <AP_HAL.h>
-#include <AP_SerialManager.h>
+#include <AP_HAL/AP_HAL.h>
+#include "AP_SerialManager.h"
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_SerialManager/AP_SerialManager.h b/libraries/AP_SerialManager/AP_SerialManager.h
index 7c4da16492..a2d0f12cc9 100644
--- a/libraries/AP_SerialManager/AP_SerialManager.h
+++ b/libraries/AP_SerialManager/AP_SerialManager.h
@@ -24,10 +24,10 @@
 #ifndef _AP_SERIALMANAGER_
 #define _AP_SERIALMANAGER_
 
-#include <AP_Math.h>
-#include <AP_Common.h>
-#include <AP_HAL.h>
-#include <GCS_MAVLink.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
 
 #define SERIALMANAGER_NUM_PORTS 5