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.

diff --git a/src/ATC/CMakeLists.txt b/src/ATC/CMakeLists.txt
index 3564a89999ec30ece7ae91560b069f6d27c26ea1..60c18e9961530106024cfc2cab2a81e9274f23d0 100644 (file)
--- 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 3ddc8ae24869fe79f5c06cc723e32fdee5bf9180..e3e52273733eb1f3572eaa67bff2936176d92235 100644 (file)
--- 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.cxx
deleted file mode 100644 (file)
index 0239416..0000000
--- a/src/ATC/atis.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- * atis.cxx
- * Written by Durk Talsma, started August 1, 2010.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *
- **************************************************************************/
-
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <iostream>
-
-#include <simgear/math/SGMath.hxx>
-#include "atis.hxx"
-
-FGAtisManager::FGAtisManager() {
-
-}
-
-FGAtisManager::~FGAtisManager() {
-
-}
-
-void FGAtisManager::init() {
-    SGSubsystem::init();
-}
-
-void FGAtisManager::update ( double time ) {
-    //cerr << "ATIS code is running at time: " << time << endl;
-}

diff --git a/src/ATC/atis.hxx b/src/ATC/atis.hxx
deleted file mode 100644 (file)
index 12fc4fd..0000000
--- a/src/ATC/atis.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++ -*- *****************************************************
- * atic.hxx
- * Written by Durk Talsma. Started August 1, 2010; based on earlier work
- * by David C. Luff
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *
- **************************************************************************/
-
-#ifndef _ATIS_HXX_
-#define _ATIS_HXX_
-
-#include <simgear/structure/subsystem_mgr.hxx>
-
-class FGAtisManager : public SGSubsystem
-{
-private:
-  
-public:
-  FGAtisManager();
-  ~FGAtisManager();
-  void init();
-  void update(double time);    
-};
-  
-#endif // _ATIS_HXX_
\ No newline at end of file

diff --git a/src/ATC/atis_mgr.cxx b/src/ATC/atis_mgr.cxx
new file mode 100644 (file)
index 0000000..034a835
--- /dev/null
+++ b/src/ATC/atis_mgr.cxx
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * atis.cxx
+ * Written by Durk Talsma, started August 1, 2010.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *
+ **************************************************************************/
+
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <iostream>
+
+#include <simgear/math/SGMath.hxx>
+#include "atis_mgr.hxx"
+
+FGAtisManager::FGAtisManager() {
+
+}
+
+FGAtisManager::~FGAtisManager() {
+
+}
+
+void FGAtisManager::init() {
+    SGSubsystem::init();
+}
+
+void FGAtisManager::update ( double time ) {
+    //cerr << "ATIS code is running at time: " << time << endl;
+}

diff --git a/src/ATC/atis_mgr.hxx b/src/ATC/atis_mgr.hxx
new file mode 100644 (file)
index 0000000..12fc4fd
--- /dev/null
+++ b/src/ATC/atis_mgr.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++ -*- *****************************************************
+ * atic.hxx
+ * Written by Durk Talsma. Started August 1, 2010; based on earlier work
+ * by David C. Luff
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *
+ **************************************************************************/
+
+#ifndef _ATIS_HXX_
+#define _ATIS_HXX_
+
+#include <simgear/structure/subsystem_mgr.hxx>
+
+class FGAtisManager : public SGSubsystem
+{
+private:
+  
+public:
+  FGAtisManager();
+  ~FGAtisManager();
+  void init();
+  void update(double time);    
+};
+  
+#endif // _ATIS_HXX_
\ No newline at end of file

diff --git a/src/ATCDCL/CMakeLists.txt b/src/ATCDCL/CMakeLists.txt
index 68a46d1c3763bf6e3b054c3c96e8ddb517e5cac5..72c1da6a9d31565547a3d3fd7c1dbe1d147813a1 100644 (file)
--- 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 7af3e3bc0e053c76c8b7a993c3ea620e6a3e66cb..0e83ba131b952db0859ab0286f97fa38747f93b5 100644 (file)
--- 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>