Minor changes to several includes to allow out of source tree builds.

diff --git a/src/FDM/UIUCModel/Makefile.am b/src/FDM/UIUCModel/Makefile.am
index f5714293fa5730b6e6e6e58e27b564106f82e5aa..c545856cccc31138729e75fb3a35489ed878997a 100644 (file)
--- a/src/FDM/UIUCModel/Makefile.am
+++ b/src/FDM/UIUCModel/Makefile.am
@@ -47,4 +47,4 @@ libUIUCModel_a_SOURCES = \
                         uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
                         uiuc_wrapper.cpp uiuc_wrapper.h
 
-INCLUDES += -I$(top_srcdir) 
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/UIUCModel/uiuc_aerodeflections.h b/src/FDM/UIUCModel/uiuc_aerodeflections.h
index ec93ff89f3315807a62af33855597bd3b71cbda9..3ca4cf65ed73ff16c66b186be2534e931c425480 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_aerodeflections.h
+++ b/src/FDM/UIUCModel/uiuc_aerodeflections.h
@@ -2,8 +2,8 @@
 #define _AERODEFLECTIONS_H_
 
 #include "uiuc_aircraft.h"                 /* aileron, elevator, rudder               */
-#include "../LaRCsim/ls_cockpit.h"     /* Long_control, Lat_control, Rudder_pedal */
-#include "../LaRCsim/ls_constants.h"   /* RAD_TO_DEG, DEG_TO_RAD                  */
+#include <FDM/LaRCsim/ls_cockpit.h>     /* Long_control, Lat_control, Rudder_pedal */
+#include <FDM/LaRCsim/ls_constants.h>   /* RAD_TO_DEG, DEG_TO_RAD                  */
 
 
 void uiuc_aerodeflections( double dt );

diff --git a/src/FDM/UIUCModel/uiuc_betaprobe.h b/src/FDM/UIUCModel/uiuc_betaprobe.h
index fddc8d66f2ff9d89b459a610b32ec7b4c4b8a48e..ec2d776200dc31bae0fa3e47e5d66fb76beeaeec 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_betaprobe.h
+++ b/src/FDM/UIUCModel/uiuc_betaprobe.h
@@ -1,11 +1,13 @@
 #ifndef _BETAPROBE_H_
 #define _BETAPROBE_H_
 
-#include "uiuc_aircraft.h"
-#include "../FDM/LaRCsim/ls_constants.h"
-#include "../FDM/LaRCsim/ls_generic.h"
 #include <math.h>
 
+#include <FDM/LaRCsim/ls_constants.h>
+#include <FDM/LaRCsim/ls_generic.h>
+
+#include "uiuc_aircraft.h"
+
 void uiuc_betaprobe();
 
 #endif  // _BETAPROBE_H_

diff --git a/src/FDM/UIUCModel/uiuc_coef_drag.h b/src/FDM/UIUCModel/uiuc_coef_drag.h
index c87f30b580a226c93a0250039512e08cd09b1b21..235347f757a488549467d366819f0891fb0fdf2b 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_drag.h
+++ b/src/FDM/UIUCModel/uiuc_coef_drag.h
@@ -1,12 +1,13 @@
 #ifndef _COEF_DRAG_H_
 #define _COEF_DRAG_H_
 
+#include <FDM/LaRCsim/ls_generic.h>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
 
 
 void uiuc_coef_drag();

diff --git a/src/FDM/UIUCModel/uiuc_coef_lift.h b/src/FDM/UIUCModel/uiuc_coef_lift.h
index 8790bdd6b2a65440c9e03d23a8c75d83272e53c8..2edfa8e317485e160912e890922f7221f339f751 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_lift.h
+++ b/src/FDM/UIUCModel/uiuc_coef_lift.h
@@ -1,12 +1,13 @@
 #ifndef _COEF_LIFT_H_
 #define _COEF_LIFT_H_
 
+#include <FDM/LaRCsim/ls_generic.h>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
 
 
 void uiuc_coef_lift();

diff --git a/src/FDM/UIUCModel/uiuc_coef_pitch.h b/src/FDM/UIUCModel/uiuc_coef_pitch.h
index 91475ad07178bf238d0fa83057716582b290d4cb..8b010e1f3b668a0c5a5909987f4923f4ec81df75 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_pitch.h
+++ b/src/FDM/UIUCModel/uiuc_coef_pitch.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_pitch();

diff --git a/src/FDM/UIUCModel/uiuc_coef_roll.h b/src/FDM/UIUCModel/uiuc_coef_roll.h
index 42f7f2ae09b5947a8d6f435df746d72babec75c9..a2cf5e41f90004bab5655020bf788053671dd66e 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_roll.h
+++ b/src/FDM/UIUCModel/uiuc_coef_roll.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_roll();

diff --git a/src/FDM/UIUCModel/uiuc_coef_sideforce.h b/src/FDM/UIUCModel/uiuc_coef_sideforce.h
index 2cef57f0299ed9b26a080b960aa9cabf902b7eaa..772dad562969de2ef4efefb01b9229bc1f4fe8d3 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_sideforce.h
+++ b/src/FDM/UIUCModel/uiuc_coef_sideforce.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_sideforce();

diff --git a/src/FDM/UIUCModel/uiuc_coef_yaw.h b/src/FDM/UIUCModel/uiuc_coef_yaw.h
index 7f02e9c437f18f53b43ce99dd50967586f3d8aed..8ab3055c25990bf7074b07f7d29f281240b7d042 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coef_yaw.h
+++ b/src/FDM/UIUCModel/uiuc_coef_yaw.h
@@ -6,7 +6,7 @@
 #include "uiuc_1Dinterpolation.h"
 #include "uiuc_2Dinterpolation.h"
 #include "uiuc_ice.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coef_yaw();

diff --git a/src/FDM/UIUCModel/uiuc_coefficients.h b/src/FDM/UIUCModel/uiuc_coefficients.h
index 06c6f502273ca617d4ba9c29ce0b17b68c5aaf7a..1036aedca1e03bee5306b54c7794846f818e61c9 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_coefficients.h
+++ b/src/FDM/UIUCModel/uiuc_coefficients.h
@@ -9,7 +9,7 @@
 #include "uiuc_coef_sideforce.h"
 #include "uiuc_coef_roll.h"
 #include "uiuc_coef_yaw.h"
-#include "../LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 
 void uiuc_coefficients();

diff --git a/src/FDM/UIUCModel/uiuc_convert.h b/src/FDM/UIUCModel/uiuc_convert.h
index 4f988a53e80caaca7e28712a365eddd0e7fa3ee4..a1fb8154360c698835b9a64f5dfa0d73aa5c554d 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_convert.h
+++ b/src/FDM/UIUCModel/uiuc_convert.h
@@ -1,7 +1,7 @@
 #ifndef _CONVERT_H_
 #define _CONVERT_H_
 
-#include "../LaRCsim/ls_constants.h"   /* uses RAD_TO_DEG, DEG_TO_RAD */
+#include <FDM/LaRCsim/ls_constants.h>   /* uses RAD_TO_DEG, DEG_TO_RAD */
 
 double uiuc_convert( int conversionType );
 

diff --git a/src/FDM/UIUCModel/uiuc_engine.h b/src/FDM/UIUCModel/uiuc_engine.h
index b408a0e0f575ff871f94cd2d40c4a6bde09863f6..3485349be8b61369cd7fb5429d99693f4f01f510 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_engine.h
+++ b/src/FDM/UIUCModel/uiuc_engine.h
@@ -2,8 +2,8 @@
 #define _ENGINE_H_
 
 #include "uiuc_aircraft.h"
-#include "../LaRCsim/ls_generic.h"
-#include "../LaRCsim/ls_cockpit.h"
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_cockpit.h>
 
 void uiuc_engine();
 #endif // _ENGINE_H_

diff --git a/src/FDM/UIUCModel/uiuc_menu.h b/src/FDM/UIUCModel/uiuc_menu.h
index ea22d31a3d291e4ce9b98e9ddcf24bca77fbdd2f..1686e086bedade1fdbb8196fcefdc92ab6a1e635 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu.h
+++ b/src/FDM/UIUCModel/uiuc_menu.h
@@ -9,9 +9,9 @@
 #include "uiuc_initializemaps.h"
 #include "uiuc_1DdataFileReader.h"
 #include "uiuc_2DdataFileReader.h"
-#include "../FDM/LaRCsim/ls_generic.h"
-#include "../FDM/LaRCsim/ls_cockpit.h"    /* Long_trim defined */
-#include "../FDM/LaRCsim/ls_constants.h"  /* INVG defined */
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_cockpit.h>    /* Long_trim defined */
+#include <FDM/LaRCsim/ls_constants.h>  /* INVG defined */
 
 bool check_float(string  &token); // To check whether the token is a float or not
 void uiuc_menu (string aircraft);

diff --git a/src/FDM/UIUCModel/uiuc_recorder.h b/src/FDM/UIUCModel/uiuc_recorder.h
index f3dfd3c6ef575405daee39013f10fb1b321fc58d..b532920a59a523f61278d30c6a8bc630cd2f53da 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_recorder.h
+++ b/src/FDM/UIUCModel/uiuc_recorder.h
@@ -4,9 +4,9 @@
 
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
-#include "../FDM/LaRCsim/ls_generic.h"
-#include "../FDM/LaRCsim/ls_cockpit.h"
-#include "../FDM/LaRCsim/ls_constants.h"
+#include <FDM/LaRCsim/ls_generic.h>
+#include <FDM/LaRCsim/ls_cockpit.h>
+#include <FDM/LaRCsim/ls_constants.h>
 
 extern double Simtime;
 

diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index b4f025913e1296f5f833b4714d61fcfda4e75d36..5867826c44f8ec1cde3fa003f5dbb09ee3bccf47 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -71,7 +71,7 @@
 #include "uiuc_recorder.h"
 #include "uiuc_menu.h"
 #include "uiuc_betaprobe.h"
-#include "../FDM/LaRCsim/ls_generic.h"
+#include <FDM/LaRCsim/ls_generic.h>
 
 extern "C" void uiuc_init_aeromodel ();
 extern "C" void uiuc_force_moment(double dt);