From b07b7c8ad0de8db12c12242ee7c69322ceb0eb0a Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 20 May 2003 02:08:31 +0000
Subject: [PATCH] Moved FDM/LaRCsim.[ch]xx to FDM/LaRCsim/LaRCsim.[ch]xx

---
 src/FDM/{ => LaRCsim}/LaRCsim.cxx | 11 ++++++-----
 src/FDM/{ => LaRCsim}/LaRCsim.hxx |  4 ++--
 src/FDM/LaRCsim/Makefile.am       |  1 +
 src/FDM/Makefile.am               |  1 -
 src/Main/fg_init.cxx              |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename src/FDM/{ => LaRCsim}/LaRCsim.cxx (99%)
 rename src/FDM/{ => LaRCsim}/LaRCsim.hxx (98%)

diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim/LaRCsim.cxx
similarity index 99%
rename from src/FDM/LaRCsim.cxx
rename to src/FDM/LaRCsim/LaRCsim.cxx
index ea8959ec0..4235db3a0 100644
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim/LaRCsim.cxx
@@ -31,16 +31,17 @@
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
 #include <FDM/flight.hxx>
-#include <FDM/LaRCsim/ls_cockpit.h>
-#include <FDM/LaRCsim/ls_generic.h>
-#include <FDM/LaRCsim/ls_interface.h>
-#include <FDM/LaRCsim/ls_constants.h>
+#include <FDM/IO360.hxx>
 #include <FDM/LaRCsimIC.hxx>
 #include <FDM/UIUCModel/uiuc_aircraft.h>
 #include <Main/fg_props.hxx>
 #include <Model/acmodel.hxx>
 
-#include "IO360.hxx"
+#include "ls_cockpit.h"
+#include "ls_generic.h"
+#include "ls_interface.h"
+#include "ls_constants.h"
+
 #include "LaRCsim.hxx"
 
 
diff --git a/src/FDM/LaRCsim.hxx b/src/FDM/LaRCsim/LaRCsim.hxx
similarity index 98%
rename from src/FDM/LaRCsim.hxx
rename to src/FDM/LaRCsim/LaRCsim.hxx
index d772ec0b5..1e0e6d948 100644
--- a/src/FDM/LaRCsim.hxx
+++ b/src/FDM/LaRCsim/LaRCsim.hxx
@@ -27,8 +27,8 @@
 #define _LARCSIM_HXX
 
 
-#include "IO360.hxx"
-#include "flight.hxx"
+#include <FDM/IO360.hxx>
+#include <FDM/flight.hxx>
 #include <FDM/LaRCsimIC.hxx>
 
 class FGLaRCsim: public FGInterface {
diff --git a/src/FDM/LaRCsim/Makefile.am b/src/FDM/LaRCsim/Makefile.am
index a26c6445e..b8f7b68de 100644
--- a/src/FDM/LaRCsim/Makefile.am
+++ b/src/FDM/LaRCsim/Makefile.am
@@ -16,6 +16,7 @@ AIRCRAFT_MODEL =  c172_aero.c c172_engine.c c172_gear.c c172_init.c \
 noinst_LIBRARIES = libLaRCsim.a
 
 libLaRCsim_a_SOURCES = \
+	LaRCsim.cxx LaRCsim.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 f5d346fd1..3458725c4 100644
--- a/src/FDM/Makefile.am
+++ b/src/FDM/Makefile.am
@@ -7,7 +7,6 @@ libFlight_a_SOURCES = \
 	Balloon.cxx Balloon.h \
 	flight.cxx flight.hxx \
 	IO360.cxx IO360.hxx \
-	LaRCsim.cxx LaRCsim.hxx \
 	LaRCsimIC.cxx LaRCsimIC.hxx \
 	MagicCarpet.cxx MagicCarpet.hxx \
 	UFO.cxx UFO.hxx \
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 9949478d4..fb20adbb8 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -89,7 +89,7 @@
 #include <FDM/ExternalNet/ExternalNet.hxx>
 #include <FDM/ExternalPipe/ExternalPipe.hxx>
 #include <FDM/JSBSim/JSBSim.hxx>
-#include <FDM/LaRCsim.hxx>
+#include <FDM/LaRCsim/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
 #include <FDM/UFO.hxx>
 #include <FDM/NullFDM.hxx>
-- 
2.39.5