From 676e4c8846bee1dd92bf4b2b34797c4194995dce Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 20 May 2003 11:29:06 +0000
Subject: [PATCH] Oops missed a couple things when I moved LaRCsim.cxx into
 src/FDM/LaRCsim/ This was masked because I didn't wipe src/FDM/libFlight.a
 and recreate it.

---
 src/FDM/{ => LaRCsim}/IO360.cxx     |  5 +++--
 src/FDM/{ => LaRCsim}/IO360.hxx     |  0
 src/FDM/LaRCsim/LaRCsim.cxx         |  4 ++--
 src/FDM/LaRCsim/LaRCsim.hxx         |  5 +++--
 src/FDM/{ => LaRCsim}/LaRCsimIC.cxx | 15 ++++++++-------
 src/FDM/{ => LaRCsim}/LaRCsimIC.hxx |  4 ++--
 src/FDM/LaRCsim/Makefile.am         |  2 ++
 src/FDM/Makefile.am                 |  2 --
 8 files changed, 20 insertions(+), 17 deletions(-)
 rename src/FDM/{ => LaRCsim}/IO360.cxx (99%)
 rename src/FDM/{ => LaRCsim}/IO360.hxx (100%)
 rename src/FDM/{ => LaRCsim}/LaRCsimIC.cxx (97%)
 rename src/FDM/{ => LaRCsim}/LaRCsimIC.hxx (99%)

diff --git a/src/FDM/IO360.cxx b/src/FDM/LaRCsim/IO360.cxx
similarity index 99%
rename from src/FDM/IO360.cxx
rename to src/FDM/LaRCsim/IO360.cxx
index 2c2d0db23..16483848f 100644
--- a/src/FDM/IO360.cxx
+++ b/src/FDM/LaRCsim/IO360.cxx
@@ -26,10 +26,11 @@
 #include STL_FSTREAM
 #include STL_IOSTREAM
 
+#include <Main/fg_props.hxx>
+
 #include "IO360.hxx"
-#include "LaRCsim/ls_constants.h"
+#include "ls_constants.h"
 
-#include <Main/fg_props.hxx>
 
 //*************************************************************************************
 // Initialise the engine model
diff --git a/src/FDM/IO360.hxx b/src/FDM/LaRCsim/IO360.hxx
similarity index 100%
rename from src/FDM/IO360.hxx
rename to src/FDM/LaRCsim/IO360.hxx
diff --git a/src/FDM/LaRCsim/LaRCsim.cxx b/src/FDM/LaRCsim/LaRCsim.cxx
index 4235db3a0..32da763b5 100644
--- a/src/FDM/LaRCsim/LaRCsim.cxx
+++ b/src/FDM/LaRCsim/LaRCsim.cxx
@@ -31,8 +31,6 @@
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
 #include <FDM/flight.hxx>
-#include <FDM/IO360.hxx>
-#include <FDM/LaRCsimIC.hxx>
 #include <FDM/UIUCModel/uiuc_aircraft.h>
 #include <Main/fg_props.hxx>
 #include <Model/acmodel.hxx>
@@ -42,6 +40,8 @@
 #include "ls_interface.h"
 #include "ls_constants.h"
 
+#include "IO360.hxx"
+#include "LaRCsimIC.hxx"
 #include "LaRCsim.hxx"
 
 
diff --git a/src/FDM/LaRCsim/LaRCsim.hxx b/src/FDM/LaRCsim/LaRCsim.hxx
index 1e0e6d948..f729e68fb 100644
--- a/src/FDM/LaRCsim/LaRCsim.hxx
+++ b/src/FDM/LaRCsim/LaRCsim.hxx
@@ -27,9 +27,10 @@
 #define _LARCSIM_HXX
 
 
-#include <FDM/IO360.hxx>
 #include <FDM/flight.hxx>
-#include <FDM/LaRCsimIC.hxx>
+
+#include "IO360.hxx"
+#include "LaRCsimIC.hxx"
 
 class FGLaRCsim: public FGInterface {
 
diff --git a/src/FDM/LaRCsimIC.cxx b/src/FDM/LaRCsim/LaRCsimIC.cxx
similarity index 97%
rename from src/FDM/LaRCsimIC.cxx
rename to src/FDM/LaRCsim/LaRCsimIC.cxx
index 2bc6caa05..562d0c5fa 100644
--- a/src/FDM/LaRCsimIC.cxx
+++ b/src/FDM/LaRCsim/LaRCsimIC.cxx
@@ -30,13 +30,14 @@
 #include <math.h>
 #include STL_IOSTREAM
 
-#include "FDM/LaRCsimIC.hxx"
-#include <FDM/LaRCsim/ls_cockpit.h>
-#include <FDM/LaRCsim/ls_generic.h>
-#include <FDM/LaRCsim/ls_interface.h>
-#include <FDM/LaRCsim/atmos_62.h>
-#include <FDM/LaRCsim/ls_constants.h>
-#include <FDM/LaRCsim/ls_geodesy.h>
+#include "ls_cockpit.h"
+#include "ls_generic.h"
+#include "ls_interface.h"
+#include "atmos_62.h"
+#include "ls_constants.h"
+#include "ls_geodesy.h"
+
+#include "LaRCsimIC.hxx"
 
 SG_USING_STD(cout);
 SG_USING_STD(endl);
diff --git a/src/FDM/LaRCsimIC.hxx b/src/FDM/LaRCsim/LaRCsimIC.hxx
similarity index 99%
rename from src/FDM/LaRCsimIC.hxx
rename to src/FDM/LaRCsim/LaRCsimIC.hxx
index 7f2bb0d85..e927fd90f 100644
--- a/src/FDM/LaRCsimIC.hxx
+++ b/src/FDM/LaRCsim/LaRCsimIC.hxx
@@ -32,8 +32,8 @@ INCLUDES
 
 #include <plib/sg.h>
 
-#include <FDM/LaRCsim/ls_constants.h>
-#include <FDM/LaRCsim/ls_types.h>
+#include "ls_constants.h"
+#include "ls_types.h"
 
 /*******************************************************************************
 CLASS DECLARATION
diff --git a/src/FDM/LaRCsim/Makefile.am b/src/FDM/LaRCsim/Makefile.am
index b8f7b68de..f98b7f31e 100644
--- a/src/FDM/LaRCsim/Makefile.am
+++ b/src/FDM/LaRCsim/Makefile.am
@@ -17,6 +17,8 @@ noinst_LIBRARIES = libLaRCsim.a
 
 libLaRCsim_a_SOURCES = \
 	LaRCsim.cxx LaRCsim.hxx \
+	LaRCsimIC.cxx LaRCsimIC.hxx \
+	IO360.cxx IO360.hxx \
 	atmos_62.c atmos_62.h \
 	default_model_routines.c default_model_routines.h \
 	ls_accel.c ls_accel.h \
diff --git a/src/FDM/Makefile.am b/src/FDM/Makefile.am
index 3458725c4..6d87e9372 100644
--- a/src/FDM/Makefile.am
+++ b/src/FDM/Makefile.am
@@ -6,8 +6,6 @@ libFlight_a_SOURCES = \
 	ADA.cxx ADA.hxx \
 	Balloon.cxx Balloon.h \
 	flight.cxx flight.hxx \
-	IO360.cxx IO360.hxx \
-	LaRCsimIC.cxx LaRCsimIC.hxx \
 	MagicCarpet.cxx MagicCarpet.hxx \
 	UFO.cxx UFO.hxx \
 	NullFDM.cxx NullFDM.hxx
-- 
2.39.5