From: James Turner <zakalawe@mac.com>
Date: Wed, 20 Oct 2010 10:48:06 +0000 (+0100)
Subject: Automake build fixes for airways commit.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=308fd1b11216f5d7e4bba350a7d798a33f06e70a;p=flightgear.git

Automake build fixes for airways commit.
---

diff --git a/src/Instrumentation/Makefile.am b/src/Instrumentation/Makefile.am
index 136929dc7..f519f99a0 100644
--- a/src/Instrumentation/Makefile.am
+++ b/src/Instrumentation/Makefile.am
@@ -31,8 +31,8 @@ libInstrumentation_a_SOURCES = \
 	tacan.cxx tacan.hxx mk_viii.cxx mk_viii.hxx \
 	dclgps.cxx dclgps.hxx \
 	render_area_2d.cxx render_area_2d.hxx        \
-		groundradar.cxx groundradar.hxx \
-		agradar.cxx agradar.hxx rad_alt.cxx rad_alt.hxx \
-	rnav_waypt_controller.cxx rnav_waypt_controller.hxx \
+	groundradar.cxx groundradar.hxx \
+	agradar.cxx agradar.hxx rad_alt.cxx rad_alt.hxx \
+	rnav_waypt_controller.cxx rnav_waypt_controller.hxx
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_builddir)/src
diff --git a/src/Instrumentation/gps.hxx b/src/Instrumentation/gps.hxx
index 3005997c0..f69a70a76 100644
--- a/src/Instrumentation/gps.hxx
+++ b/src/Instrumentation/gps.hxx
@@ -8,6 +8,7 @@
 #define __INSTRUMENTS_GPS_HXX 1
 
 #include <cassert>
+#include <memory>
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
diff --git a/src/Instrumentation/rnav_waypt_controller.cxx b/src/Instrumentation/rnav_waypt_controller.cxx
index fbdb5eeb1..977452e18 100644
--- a/src/Instrumentation/rnav_waypt_controller.cxx
+++ b/src/Instrumentation/rnav_waypt_controller.cxx
@@ -19,6 +19,8 @@
 
 #include "rnav_waypt_controller.hxx"
 
+#include <cassert>
+
 #include <simgear/sg_inlines.h>
 #include <simgear/structure/exception.hxx>
 
diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index 66c650045..30016afe3 100644
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -14,6 +14,7 @@ libNavaids_a_SOURCES = \
 	route.hxx route.cxx \
 	waypoint.hxx waypoint.cxx \
 	procedure.hxx procedure.cxx \
+	awynet.cxx awynet.hxx
 
 #
 # testnavs_SOURCES = testnavs.cxx
diff --git a/src/Navaids/procedure.cxx b/src/Navaids/procedure.cxx
index 4080f0a75..5104f4c75 100644
--- a/src/Navaids/procedure.cxx
+++ b/src/Navaids/procedure.cxx
@@ -19,6 +19,9 @@
 
 #include "procedure.hxx"
 
+#include <cassert>
+#include <algorithm> // for reverse_copy
+
 #include <simgear/structure/exception.hxx>
 
 #include <Navaids/waypoint.hxx>