From 07d430c129e6214c06df994b42bb997b05dfbd31 Mon Sep 17 00:00:00 2001
From: Dave Luff <daveluff@ntlworld.com>
Date: Wed, 29 Dec 2010 18:52:39 +0000
Subject: [PATCH] More fixes to the ATCDCL & ATC compilation

Rename ATC/atis.[ch]xx to ATC/atis_mgr.[ch]xx, to avoid confusingly
having 2 atis.cxx and 2 atis.hxx in the source tree.  Also fix a copy
and paste error in src/ATCDCL/CMakeLists.txt.
---
 src/ATC/CMakeLists.txt             | 2 +-
 src/ATC/Makefile.am                | 2 +-
 src/ATC/{atis.cxx => atis_mgr.cxx} | 2 +-
 src/ATC/{atis.hxx => atis_mgr.hxx} | 0
 src/ATCDCL/CMakeLists.txt          | 2 +-
 src/Main/fg_init.cxx               | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/ATC/{atis.cxx => atis_mgr.cxx} (98%)
 rename src/ATC/{atis.hxx => atis_mgr.hxx} (100%)

diff --git a/src/ATC/CMakeLists.txt b/src/ATC/CMakeLists.txt
index 3564a8999..60c18e996 100644
--- a/src/ATC/CMakeLists.txt
+++ b/src/ATC/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(FlightGearComponent)
 
 set(SOURCES
-	atis.cxx
+	atis_mgr.cxx
 	trafficcontrol.cxx
 	)
 	
diff --git a/src/ATC/Makefile.am b/src/ATC/Makefile.am
index 3ddc8ae24..e3e522737 100644
--- a/src/ATC/Makefile.am
+++ b/src/ATC/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LIBRARIES = libATC.a
 
 libATC_a_SOURCES = \
-	atis.cxx atis.hxx \
+	atis_mgr.cxx atis_mgr.hxx \
 	trafficcontrol.cxx trafficcontrol.hxx 
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff --git a/src/ATC/atis.cxx b/src/ATC/atis_mgr.cxx
similarity index 98%
rename from src/ATC/atis.cxx
rename to src/ATC/atis_mgr.cxx
index 02394167b..034a8358a 100644
--- a/src/ATC/atis.cxx
+++ b/src/ATC/atis_mgr.cxx
@@ -27,7 +27,7 @@
 #include <iostream>
 
 #include <simgear/math/SGMath.hxx>
-#include "atis.hxx"
+#include "atis_mgr.hxx"
 
 FGAtisManager::FGAtisManager() {
 
diff --git a/src/ATC/atis.hxx b/src/ATC/atis_mgr.hxx
similarity index 100%
rename from src/ATC/atis.hxx
rename to src/ATC/atis_mgr.hxx
diff --git a/src/ATCDCL/CMakeLists.txt b/src/ATCDCL/CMakeLists.txt
index 68a46d1c3..72c1da6a9 100644
--- a/src/ATCDCL/CMakeLists.txt
+++ b/src/ATCDCL/CMakeLists.txt
@@ -11,4 +11,4 @@ set(SOURCES
 	ATCProjection.cxx
 	)
 	
-flightgear_component(ATC "${SOURCES}")
+flightgear_component(ATCDCL "${SOURCES}")
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 7af3e3bc0..0e83ba131 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -76,7 +76,7 @@
 
 #include <ATCDCL/ATCmgr.hxx>
 #include <ATCDCL/commlist.hxx>
-#include <ATC/atis.hxx>
+#include <ATC/atis_mgr.hxx>
 
 #include <Autopilot/route_mgr.hxx>
 #include <Autopilot/autopilotgroup.hxx>
-- 
2.39.5