From 1209546e0859113fc1113515f1854cc2be0c68d4 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 1 Feb 1999 21:33:23 +0000
Subject: [PATCH] Renamed FlightGear/Simulator/Flight to
 FlightGear/Simulator/FDM since Jon accepted my offer to do this and thought
 it was a good idea.

---
 Aircraft/aircraft.hxx   |  6 +++++-
 Astro/moon.cxx          |  3 ++-
 Astro/sky.cxx           |  6 +++++-
 Autopilot/autopilot.hxx |  2 +-
 Cockpit/hud.hxx         |  6 +++++-
 External/external.cxx   |  6 +++++-
 FDM/LaRCsim.cxx         | 12 ++++++++----
 FDM/flight.cxx          |  8 ++++++--
 Main/Makefile.am        |  8 ++++----
 Main/options.cxx        |  6 +++++-
 Main/views.hxx          |  6 +++++-
 Simulator/Makefile.am   |  2 +-
 Slew/slew.cxx           |  6 +++++-
 Time/fg_time.cxx        |  6 +++++-
 Time/fg_time.hxx        |  6 +++++-
 15 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/Aircraft/aircraft.hxx b/Aircraft/aircraft.hxx
index 75a9c068d..2b8c12cfa 100644
--- a/Aircraft/aircraft.hxx
+++ b/Aircraft/aircraft.hxx
@@ -33,7 +33,7 @@
 #endif                                   
 
 
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Controls/controls.hxx>
 
 
@@ -61,6 +61,10 @@ void fgAircraftOutputCurrent(fgAIRCRAFT *a);
 
 
 // $Log$
+// Revision 1.5  1999/02/01 21:33:24  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.4  1998/12/05 16:13:10  curt
 // Renamed class fgCONTROLS to class FGControls.
 //
diff --git a/Astro/moon.cxx b/Astro/moon.cxx
index 6ca80c5ae..6e791f5fe 100644
--- a/Astro/moon.cxx
+++ b/Astro/moon.cxx
@@ -22,7 +22,8 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
-#include <Flight/flight.hxx>
+
+#include <FDM/flight.hxx>
 
 #include <string.h>
 #include "moon.hxx"
diff --git a/Astro/sky.cxx b/Astro/sky.cxx
index e132275d9..0e9c32e40 100644
--- a/Astro/sky.cxx
+++ b/Astro/sky.cxx
@@ -37,7 +37,7 @@
 
 #include <Aircraft/aircraft.hxx>
 #include <Debug/logstream.hxx>
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/views.hxx>
 #include <Math/fg_random.h>
@@ -362,6 +362,10 @@ void fgSkyRender( void ) {
 
 
 // $Log$
+// Revision 1.19  1999/02/01 21:33:26  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.18  1999/02/01 21:09:00  curt
 // Bug fix in vertex order of inner disk (fan) of the sky dome.
 //
diff --git a/Autopilot/autopilot.hxx b/Autopilot/autopilot.hxx
index 9f729fa44..8d0b62024 100644
--- a/Autopilot/autopilot.hxx
+++ b/Autopilot/autopilot.hxx
@@ -28,7 +28,7 @@
                        
 
 #include <Aircraft/aircraft.hxx>
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Controls/controls.hxx>
                        
                        
diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx
index e1b34e1e5..f25358c4d 100644
--- a/Cockpit/hud.hxx
+++ b/Cockpit/hud.hxx
@@ -48,7 +48,7 @@
 #include <fg_typedefs.h>
 #include <fg_constants.h>
 #include <Aircraft/aircraft.hxx>
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Controls/controls.hxx>
 
 #include <deque>        // STL double ended queue
@@ -524,6 +524,10 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day );
 #endif // _HUD_H
 
 // $Log$
+// Revision 1.17  1999/02/01 21:33:28  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.16  1998/10/17 01:33:59  curt
 // C++ ifying ...
 //
diff --git a/External/external.cxx b/External/external.cxx
index 92930394d..0340f921e 100644
--- a/External/external.cxx
+++ b/External/external.cxx
@@ -26,7 +26,7 @@
 
 #include "external.hxx"
 
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 
 
@@ -42,6 +42,10 @@ void fgExternalUpdate( FGState& f, int multiloop ) {
 
 
 // $Log$
+// Revision 1.4  1999/02/01 21:33:32  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.3  1999/01/19 17:52:11  curt
 // Working on being able to extrapolate a new position and orientation
 // based on a position, orientation, and time offset.
diff --git a/FDM/LaRCsim.cxx b/FDM/LaRCsim.cxx
index 5a714f9fc..4bc0781c6 100644
--- a/FDM/LaRCsim.cxx
+++ b/FDM/LaRCsim.cxx
@@ -26,10 +26,10 @@
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
-#include <Flight/flight.hxx>
-#include <Flight/LaRCsim/ls_cockpit.h>
-#include <Flight/LaRCsim/ls_generic.h>
-#include <Flight/LaRCsim/ls_interface.h>
+#include <FDM/flight.hxx>
+#include <FDM/LaRCsim/ls_cockpit.h>
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_interface.h>
 
 
 // Initialize the LaRCsim flight model, dt is the time increment for
@@ -389,6 +389,10 @@ int fgLaRCsim_2_FGState (FGState& f) {
 
 
 // $Log$
+// Revision 1.10  1999/02/01 21:33:30  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.9  1999/01/08 19:27:36  curt
 // Fixed AOA reading on HUD.
 // Continued work on time jitter compensation.
diff --git a/FDM/flight.cxx b/FDM/flight.cxx
index e2f017cd4..5216c251b 100644
--- a/FDM/flight.cxx
+++ b/FDM/flight.cxx
@@ -28,8 +28,8 @@
 #include "LaRCsim.hxx"
 
 #include <Debug/logstream.hxx>
-#include <Flight/External/external.hxx>
-#include <Flight/LaRCsim/ls_interface.h>
+#include <FDM/External/external.hxx>
+#include <FDM/LaRCsim/ls_interface.h>
 #include <Include/fg_constants.h>
 #include <Math/fg_geodesy.hxx>
 #include <Time/timestamp.hxx>
@@ -189,6 +189,10 @@ void fgFDMSetGroundElevation(int model, double ground_meters) {
 
 
 // $Log$
+// Revision 1.14  1999/02/01 21:33:31  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.13  1999/01/27 04:48:39  curt
 // Set the runway height in cur_fdm_state as well as base_fdm_state.
 //
diff --git a/Main/Makefile.am b/Main/Makefile.am
index c116729e6..399eee957 100644
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -50,10 +50,10 @@ fgfs_LDADD = \
 	$(top_builddir)/Simulator/Autopilot/libAutopilot.a \
 	$(top_builddir)/Simulator/Cockpit/libCockpit.a \
 	$(top_builddir)/Simulator/Controls/libControls.a \
-	$(top_builddir)/Simulator/Flight/libFlight.a \
-	$(top_builddir)/Simulator/Flight/External/libExternal.a \
-	$(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \
-	$(top_builddir)/Simulator/Flight/Slew/libSlew.a \
+	$(top_builddir)/Simulator/FDM/libFlight.a \
+	$(top_builddir)/Simulator/FDM/External/libExternal.a \
+	$(top_builddir)/Simulator/FDM/LaRCsim/libLaRCsim.a \
+	$(top_builddir)/Simulator/FDM/Slew/libSlew.a \
 	$(top_builddir)/Simulator/GUI/libGUI.a \
 	$(top_builddir)/Simulator/Scenery/libScenery.a \
 	$(top_builddir)/Simulator/Airports/libAirports.a \
diff --git a/Main/options.cxx b/Main/options.cxx
index a963a4ff5..d889c7bbf 100644
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -33,7 +33,7 @@
 #include <string>
 
 #include <Debug/logstream.hxx>
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
 #include <Misc/fgstream.hxx>
@@ -629,6 +629,10 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.38  1999/02/01 21:33:35  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.37  1999/01/19 20:57:05  curt
 // MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
 //
diff --git a/Main/views.hxx b/Main/views.hxx
index e52bbfb99..60520ad69 100644
--- a/Main/views.hxx
+++ b/Main/views.hxx
@@ -31,7 +31,7 @@
 #endif                                   
 
 
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Math/mat3.h>
 #include <Math/point3d.hxx>
 #include <Time/fg_time.hxx>
@@ -230,6 +230,10 @@ extern FGView current_view;
 
 
 // $Log$
+// Revision 1.19  1999/02/01 21:33:36  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.18  1998/12/11 20:26:30  curt
 // Fixed view frustum culling accuracy bug so we can look out the sides and
 // back without tri-stripes dropping out.
diff --git a/Simulator/Makefile.am b/Simulator/Makefile.am
index ed862d745..e806ae16c 100644
--- a/Simulator/Makefile.am
+++ b/Simulator/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = \
 	Autopilot \
 	Cockpit \
 	Controls \
-	Flight \
+	FDM \
 	GUI \
 	Joystick \
 	Objects \
diff --git a/Slew/slew.cxx b/Slew/slew.cxx
index 60af86860..5026f7d60 100644
--- a/Slew/slew.cxx
+++ b/Slew/slew.cxx
@@ -26,7 +26,7 @@
 
 #include "slew.hxx"
 
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
 #include <Include/fg_constants.h>
@@ -83,6 +83,10 @@ void fgSlewUpdate( void ) {
 
 
 // $Log$
+// Revision 1.5  1999/02/01 21:33:33  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.4  1998/12/05 16:13:14  curt
 // Renamed class fgCONTROLS to class FGControls.
 //
diff --git a/Time/fg_time.cxx b/Time/fg_time.cxx
index c37c28752..62b19933f 100644
--- a/Time/fg_time.cxx
+++ b/Time/fg_time.cxx
@@ -54,7 +54,7 @@
 #include <Astro/sky.hxx>
 #include <Astro/solarsystem.hxx>
 #include <Debug/logstream.hxx>
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
 #include <Time/light.hxx>
@@ -399,6 +399,10 @@ void fgTimeUpdate(FGState *f, fgTIME *t) {
 
 
 // $Log$
+// Revision 1.30  1999/02/01 21:33:37  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.29  1999/01/19 20:57:08  curt
 // MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
 //
diff --git a/Time/fg_time.hxx b/Time/fg_time.hxx
index 979c2251b..04c48470a 100644
--- a/Time/fg_time.hxx
+++ b/Time/fg_time.hxx
@@ -49,7 +49,7 @@
 #  include <time.h>
 #endif
 
-#include <Flight/flight.hxx>
+#include <FDM/flight.hxx>
 
 
 // Define a structure containing global time parameters
@@ -105,6 +105,10 @@ void fgTimeUpdate(FGState *f, fgTIME *t);
 
 
 // $Log$
+// Revision 1.13  1999/02/01 21:33:39  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
 // Revision 1.12  1999/01/07 20:25:35  curt
 // Portability changes and updates from Bernie Bright.
 //
-- 
2.39.2