Automake build fixes for airways commit.

diff --git a/src/Instrumentation/Makefile.am b/src/Instrumentation/Makefile.am
index 136929dc760a7b48aed75b6e749b9b50f9b8c2e3..f519f99a04fe0dcac65f71d0de7f5f08aa3fa6f6 100644 (file)
--- 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 3005997c0204bd07e87f87c3a4b155a0ffcd7072..f69a70a76be4b6fcc0922b92210e2fe5d13f3ef7 100644 (file)
--- 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 fbdb5eeb16a136a9e797ac99fc1c483e2d1cd334..977452e1806deb8a255e5b6c6f376ab89430e4af 100644 (file)
--- 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 66c65004537e3b3ed8c57cbb216009168244c81e..30016afe3ef73e50ce8a2b493b1254b9f68bbf12 100644 (file)
--- 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 4080f0a75d99de5e031469e44ddda26ed98f1c4e..5104f4c75531ff79d80d986899dc4770f09bb68a 100644 (file)
--- 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>