From 286697b8447116803bff30f9009b5ca9b356bd3c Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Thu, 10 Mar 2016 21:41:18 -0300
Subject: [PATCH] AP_Compass: don't rebuild tree when single driver changes

Let the drivers be internal to the library so we don't need to rebuild
the entire tree when a single driver changes.
---
 libraries/AP_Compass/AP_Compass.h |  6 +-----
 libraries/AP_Compass/Compass.cpp  | 11 ++++++++++-
 libraries/AP_Compass/Compass.h    | 23 ++++++++---------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/libraries/AP_Compass/AP_Compass.h b/libraries/AP_Compass/AP_Compass.h
index fd7aaa48ef..63253a7465 100644
--- a/libraries/AP_Compass/AP_Compass.h
+++ b/libraries/AP_Compass/AP_Compass.h
@@ -2,8 +2,4 @@
 
 /// @file	AP_Compass.h
 /// @brief	Catch-all header that defines all supported compass classes.
-
-#include "AP_Compass_HMC5843.h"
-#include "AP_Compass_HIL.h"
-#include "AP_Compass_PX4.h"
-#include "AP_Compass_AK8963.h"
+#include "Compass.h"
diff --git a/libraries/AP_Compass/Compass.cpp b/libraries/AP_Compass/Compass.cpp
index a4c4096795..1abaf40e7f 100644
--- a/libraries/AP_Compass/Compass.cpp
+++ b/libraries/AP_Compass/Compass.cpp
@@ -1,8 +1,17 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #include <AP_HAL/AP_HAL.h>
-#include "Compass.h"
 #include <AP_Vehicle/AP_Vehicle.h>
 
+#include "AP_Compass_AK8963.h"
+#include "AP_Compass_Backend.h"
+#include "AP_Compass_HIL.h"
+#include "AP_Compass_HMC5843.h"
+#include "AP_Compass_LSM303D.h"
+#include "AP_Compass_PX4.h"
+#include "AP_Compass_QURT.h"
+#include "AP_Compass_qflight.h"
+#include "AP_Compass.h"
+
 extern AP_HAL::HAL& hal;
 
 #if APM_BUILD_TYPE(APM_BUILD_ArduCopter)
diff --git a/libraries/AP_Compass/Compass.h b/libraries/AP_Compass/Compass.h
index 215297e1bc..f758db8e83 100644
--- a/libraries/AP_Compass/Compass.h
+++ b/libraries/AP_Compass/Compass.h
@@ -1,14 +1,16 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #pragma once
 
 #include <inttypes.h>
-#include <GCS_MAVLink/GCS_MAVLink.h>
-#include "CompassCalibrator.h"
+
 #include <AP_Common/AP_Common.h>
-#include <AP_Param/AP_Param.h>
-#include <AP_Math/AP_Math.h>
-#include <AP_Declination/AP_Declination.h> // ArduPilot Mega Declination Helper Library
+#include <AP_Declination/AP_Declination.h>
 #include <AP_HAL/AP_HAL.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_Param/AP_Param.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+
+#include "CompassCalibrator.h"
 #include "AP_Compass_Backend.h"
 
 // compass product id
@@ -410,12 +412,3 @@ private:
 
     AP_Float _calibration_threshold;
 };
-
-#include "AP_Compass_Backend.h"
-#include "AP_Compass_HMC5843.h"
-#include "AP_Compass_HIL.h"
-#include "AP_Compass_AK8963.h"
-#include "AP_Compass_PX4.h"
-#include "AP_Compass_LSM303D.h"
-#include "AP_Compass_qflight.h"
-#include "AP_Compass_QURT.h"