Standardize directory names

Reorganized. Created a new top level include directory that will hold all of Trick's header files. Moved all of the Trick headers to this directory. Created a libexec directory that holds all of the executables that users don't need to execute directly. Changed all of the executables remaining in bin to start with "trick-". In the sim_services directories changed all source files to find the Trick headers in their new location. Since all of the include files are gone in sim_services, removed the src directories as well, moving all of the source files up a level. Moved the makefiles, docs, man, and other architecture independent files into a top level share directory. Renamed lib_${TRICK_HOST_CPU} to lib64 or lib depending on the platform we're currently on. refs #63
2025-06-17 22:58:25 +00:00 · 2015-06-01 10:28:29 -05:00
parent f6fed320c4
commit 19025d77ad
1014 changed files with 7205 additions and 7870 deletions
--- a/trick_source/trick_utils/math/src/LUD_inv.c
+++ b/trick_source/trick_utils/math/src/LUD_inv.c
@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>                    // for memcpy
 #include <stdlib.h>                    // for malloc
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int LUD_inv(                    /* RETURN: -- Zero */
               double **y,      /* Out: Matrix inverse */
--- a/trick_source/trick_utils/math/src/LUT_inv.c
+++ b/trick_source/trick_utils/math/src/LUT_inv.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((M Schira) (McDonnell Douglas) (Feb 1994) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int LUT_inv(                    /* RETURN: -- Zero */
               double **y,      /* OUT: -- Matrix inverse */
--- a/trick_source/trick_utils/math/src/LU_bksb.c
+++ b/trick_source/trick_utils/math/src/LU_bksb.c
@ -11,7 +11,7 @@

   PROGRAMMERS: (((M Schira) (McDonnell Douglas) (Jan 1993) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void LU_bksb(                   /* Return: Zero */
                double *b,      /* Inout: Temporary storage */
--- a/trick_source/trick_utils/math/src/LU_dcmp.c
+++ b/trick_source/trick_utils/math/src/LU_dcmp.c
@ -6,7 +6,7 @@
   PROGRAMMERS: (((M Schira) (McDonnell Douglas) (Jan 1993) (v1.0) (Init Release))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 #define tiny 1.0e-20

--- a/trick_source/trick_utils/math/src/dLU_Choleski.c
+++ b/trick_source/trick_utils/math/src/dLU_Choleski.c
@ -22,7 +22,7 @@
   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 #define TINY (1.0e-37)

--- a/trick_source/trick_utils/math/src/dLU_solver.c
+++ b/trick_source/trick_utils/math/src/dLU_solver.c
@ -16,7 +16,7 @@
   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 #define TINY (1.0e-20)

--- a/trick_source/trick_utils/math/src/dS_function.c
+++ b/trick_source/trick_utils/math/src/dS_function.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (3/22/91) (Trick-CR-00000) (Initial release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 double dS_function(             /* Return: -- 0.0 <= value <= 1.0 */
                      double x, /* In: 'x' parameter */
--- a/trick_source/trick_utils/math/src/deuler_123.c
+++ b/trick_source/trick_utils/math/src/deuler_123.c
@ -19,7 +19,7 @@ PROGRAMMERS:
        angle[2] = YAW      - M_PI   <= YAW   < M_PI
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int euler123(
        double angle[3],    /* In:  r  Method=0, 0=ROLL , 1=PITCH , 2=YAW */
--- a/trick_source/trick_utils/math/src/deuler_132.c
+++ b/trick_source/trick_utils/math/src/deuler_132.c
@ -32,7 +32,7 @@ PROGRAMMERS:
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int euler132(
        double angle[3],    /* In: r   method=0, 0=ROLL , 1=YAW , 2=PITCH */
--- a/trick_source/trick_utils/math/src/deuler_213.c
+++ b/trick_source/trick_utils/math/src/deuler_213.c
@ -20,7 +20,7 @@ PROGRAMMERS:
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int euler213(double angle[3],   /* In:  r  Method=0, 0=PITCH , 1=ROLL , 2=YAW */
             double mat[3][3],  /* Out: r  Method=0, 
--- a/trick_source/trick_utils/math/src/deuler_231.c
+++ b/trick_source/trick_utils/math/src/deuler_231.c
@ -20,7 +20,7 @@ PROGRAMMERS:
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int euler231( /* Return: --   None. */
        double angle[3],    /* In: r  Method=0, 0=PITCH, 1=YAW, 2=ROLL */
--- a/trick_source/trick_utils/math/src/deuler_312.c
+++ b/trick_source/trick_utils/math/src/deuler_312.c
@ -20,7 +20,7 @@ PROGRAMMERS:
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int euler312(
        double angle[3],    /* In: r   Method=0, 0=YAW, 1=ROLL, 2=PITCH */
--- a/trick_source/trick_utils/math/src/deuler_321.c
+++ b/trick_source/trick_utils/math/src/deuler_321.c
@ -20,7 +20,7 @@ PROGRAMMERS:
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int euler321(
        double angle[3],    /* In:  r   method=0, 0=YAW, 1=PITCH, 2=ROLL */
--- a/trick_source/trick_utils/math/src/dm_add.c
+++ b/trick_source/trick_utils/math/src/dm_add.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_add(double sum[3][3],   /* Out: Sum of the two matrices */
            double mat1[3][3],  /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/dm_copy.c
+++ b/trick_source/trick_utils/math/src/dm_copy.c
@ -7,7 +7,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_copy(double copy[3][3], /* Out: copy of the matrix */
             double mat[3][3])
--- a/trick_source/trick_utils/math/src/dm_ident.c
+++ b/trick_source/trick_utils/math/src/dm_ident.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_ident(double mat[3][3])
 {                                      /* Inout: Matrix identity */
--- a/trick_source/trick_utils/math/src/dm_init.c
+++ b/trick_source/trick_utils/math/src/dm_init.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_init(double mat[3][3])
 {                                      /* Inout: Initialized matrix */
--- a/trick_source/trick_utils/math/src/dm_invert.c
+++ b/trick_source/trick_utils/math/src/dm_invert.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corporation) (4/1/91) (Trick-CR-00004) (Gravity / Inertial Frame Models))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int dm_invert(double inv[3][3], /* Out: The 3X3 inverse of matrix 'm' */
              double m[3][3])
--- a/trick_source/trick_utils/math/src/dm_invert_symm.c
+++ b/trick_source/trick_utils/math/src/dm_invert_symm.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corporation) (4/1/91) (Trick-CR-00004) (Gravity / Inertial Frame Models))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 int dm_invert_symm(double inv[3][3],    /* Out: The 3X3 inverse of matrix 'm' */
                   double m[3][3])
--- a/trick_source/trick_utils/math/src/dm_orthonormal.c
+++ b/trick_source/trick_utils/math/src/dm_orthonormal.c
@ -6,7 +6,7 @@

   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (4/1/91) (Trick-CR-00004) (Gravity / Inertial Frame Models))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_orthonormal(            /* Return: -- none */
                       double m[3][3],  /* Inout: Matrix to be orthonormalized. */
--- a/trick_source/trick_utils/math/src/dm_print.c
+++ b/trick_source/trick_utils/math/src/dm_print.c
@ -6,7 +6,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_print(double mat[3][3])
 {                                      /* In: matrix to be printed */
--- a/trick_source/trick_utils/math/src/dm_scale.c
+++ b/trick_source/trick_utils/math/src/dm_scale.c
@ -7,7 +7,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_scale(double prod[3][3],        /* Out: Product of the two matrices */
              double mat[3][3], /* In: Matrix */
--- a/trick_source/trick_utils/math/src/dm_sub.c
+++ b/trick_source/trick_utils/math/src/dm_sub.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_sub(double diff[3][3],  /* Out: Difference of the two matrices */
            double mat1[3][3],  /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/dm_trans.c
+++ b/trick_source/trick_utils/math/src/dm_trans.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/Johnson Space Center) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dm_trans(double trans[3][3],       /* Out: transpose of the matrix */
              double mat[3][3])
--- a/trick_source/trick_utils/math/src/dmtxm.c
+++ b/trick_source/trick_utils/math/src/dmtxm.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dmtxm(double prod[3][3],   /* Out: product of the two matrices */
           double mat1[3][3],   /* In: matrix 1 */
--- a/trick_source/trick_utils/math/src/dmtxmt.c
+++ b/trick_source/trick_utils/math/src/dmtxmt.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dmtxmt(                    /* Return: -- none */
               double prod[3][3],       /* Out: Product of the two matrices */
--- a/trick_source/trick_utils/math/src/dmtxv.c
+++ b/trick_source/trick_utils/math/src/dmtxv.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dmtxv(double prod[],       /* Out: Product of the matrix and vector */
           double mat[3][3],    /* In: Matrix */
--- a/trick_source/trick_utils/math/src/dmxm.c
+++ b/trick_source/trick_utils/math/src/dmxm.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dmxm(                      /* Return: -- none */
             double prod[3][3], /* Out: Product of the two matrices */
--- a/trick_source/trick_utils/math/src/dmxmt.c
+++ b/trick_source/trick_utils/math/src/dmxmt.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dmxmt(double prod[3][3],   /* Out: Product of the two matrices */
           double mat1[3][3],   /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/dmxv.c
+++ b/trick_source/trick_utils/math/src/dmxv.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dmxv(double prod[],        /* Out: Product of the matrix and vector */
          double mat[3][3],     /* In: Matrix */
--- a/trick_source/trick_utils/math/src/drandom_gaussian.c
+++ b/trick_source/trick_utils/math/src/drandom_gaussian.c
@ -9,7 +9,7 @@

 #include <stdlib.h>

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 #define MAX_VALUE 32768.0              /* 32768 = 2**15 */
--- a/trick_source/trick_utils/math/src/dsingle_axis_rot.c
+++ b/trick_source/trick_utils/math/src/dsingle_axis_rot.c
@ -29,7 +29,7 @@
 #include <math.h>
 #include <stdio.h>

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 void dsingle_axis_rot(          /* Return: -- None */
--- a/trick_source/trick_utils/math/src/dv_add.c
+++ b/trick_source/trick_utils/math/src/dv_add.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_add(double sum[],       /* Out: Sum of the two vectors */
            double vect1[],     /* In: Vector 1 */
--- a/trick_source/trick_utils/math/src/dv_copy.c
+++ b/trick_source/trick_utils/math/src/dv_copy.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_copy(double copy[],     /* Out: copy of the vector */
             double vect[])
--- a/trick_source/trick_utils/math/src/dv_cross.c
+++ b/trick_source/trick_utils/math/src/dv_cross.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_cross(double cross[],   /* Out: cross product of the two vectors */
              double vect1[],   /* In: vector 1 */
--- a/trick_source/trick_utils/math/src/dv_dot.c
+++ b/trick_source/trick_utils/math/src/dv_dot.c
@ -3,7 +3,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 double dv_dot(                  /* Return: Scalar dot or inner product */
                 double vect1[],        /* In: Vector 1 */
--- a/trick_source/trick_utils/math/src/dv_init.c
+++ b/trick_source/trick_utils/math/src/dv_init.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_init(double vect[])
 {                                      /* Inout: Vector to be initialized */
--- a/trick_source/trick_utils/math/src/dv_mag.c
+++ b/trick_source/trick_utils/math/src/dv_mag.c
@ -3,7 +3,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 double dv_mag(                  /* Return: Magnitude of the vector */
                 double vect[])
--- a/trick_source/trick_utils/math/src/dv_norm.c
+++ b/trick_source/trick_utils/math/src/dv_norm.c
@ -5,7 +5,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_norm(double norm[3],    /* Out: Norm vector */
             double vect[3])
--- a/trick_source/trick_utils/math/src/dv_print.c
+++ b/trick_source/trick_utils/math/src/dv_print.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_print(double vect[])
 {                                      /* In: Vector to be printed */
--- a/trick_source/trick_utils/math/src/dv_scale.c
+++ b/trick_source/trick_utils/math/src/dv_scale.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_scale(double prod[],    /* Out: Produce of the vector and the scalar */
              double vect[],    /* In: Vector */
--- a/trick_source/trick_utils/math/src/dv_skew.c
+++ b/trick_source/trick_utils/math/src/dv_skew.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_skew(double skew[3][3], /* Out: Skew symmetic matrix */
             double vect[])
--- a/trick_source/trick_utils/math/src/dv_store.c
+++ b/trick_source/trick_utils/math/src/dv_store.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_store(double vect[],    /* Out: Vector */
              double scalar)
--- a/trick_source/trick_utils/math/src/dv_sub.c
+++ b/trick_source/trick_utils/math/src/dv_sub.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dv_sub(double diff[],      /* Out: Difference of the two vectors */
            double vect1[],     /* In: Vector 1 */
--- a/trick_source/trick_utils/math/src/dvxm.c
+++ b/trick_source/trick_utils/math/src/dvxm.c
@ -5,7 +5,7 @@
 */


-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dvxm(double prod[],        /* Out: Product of the vector and the matrix */
          double vect[],        /* In: Vector */
--- a/trick_source/trick_utils/math/src/dvxv_add.c
+++ b/trick_source/trick_utils/math/src/dvxv_add.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dvxv_add(double sum[],     /* Out: Sum of cross product and sum */
              double vect1[],   /* In: Vector1 */
--- a/trick_source/trick_utils/math/src/dvxv_sub.c
+++ b/trick_source/trick_utils/math/src/dvxv_sub.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1990) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void dvxv_sub(double diff[],    /* Out: Difference of cross product and difference */
              double vect1[],   /* In: Vector1 */
--- a/trick_source/trick_utils/math/src/eigen_hh_red.c
+++ b/trick_source/trick_utils/math/src/eigen_hh_red.c
@ -7,7 +7,7 @@

   PROGRAMMERS: (((M Schira) (MDSS) (Jan 1994) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 void eigen_hh_red(double **a,   /* In: Input matrix */
--- a/trick_source/trick_utils/math/src/eigen_jacobi.c
+++ b/trick_source/trick_utils/math/src/eigen_jacobi.c
@ -10,7 +10,7 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 int eigen_jacobi(double **k,    /* In: Input stiffness matrix */
--- a/trick_source/trick_utils/math/src/eigen_jacobi_4.c
+++ b/trick_source/trick_utils/math/src/eigen_jacobi_4.c
@ -10,7 +10,7 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void eigen_jacobi_4(double k[4][4],     /* In: input stiffness matrix */
                    double mass[4][4],  /* In: input mass matrix */
--- a/trick_source/trick_utils/math/src/eigen_ql.c
+++ b/trick_source/trick_utils/math/src/eigen_ql.c
@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void eigen_ql(double *d,        /* Inout: input diagonal elements, output eigenvalues */
              double *e,        /* In: off diagonal elements */
--- a/trick_source/trick_utils/math/src/euler_matrix.c
+++ b/trick_source/trick_utils/math/src/euler_matrix.c
@ -6,8 +6,8 @@

   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (2/1/91) (Trick-CR-00000) (Initial Release))) */

-#include "../include/reference_frame.h"
-#include "../include/trick_math.h"
+#include "trick/reference_frame.h"
+#include "trick/trick_math.h"

 int euler_matrix(double angle[3],       /* In: r Method=0, Euler angles */
                 double mat[3][3],      /* Out: r Method=0, Coordinate transformation matrix */
--- a/trick_source/trick_utils/math/src/gauss_rnd_bell.c
+++ b/trick_source/trick_utils/math/src/gauss_rnd_bell.c
@ -14,8 +14,8 @@
   PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998) 
   (--) (Trick format)) ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */

-#include "../include/rand_generator.h"
-#include "../include/trick_math.h"
+#include "trick/rand_generator.h"
+#include "trick/trick_math.h"


 double gauss_rnd_bell(          /* Return: Random number */
--- a/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c
+++ b/trick_source/trick_utils/math/src/gauss_rnd_pseudo.c
@ -13,8 +13,8 @@
   PROGRAMMERS: (((Ray Li) (LMES/DUAL) (96 Nov) (1.0) (ICDS random number generator)) ((Robert Gay) (LinCom) (May 1998) 
   (--) (Trick format)) ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math))) */

-#include "../include/rand_generator.h"
-#include "../include/trick_math.h"
+#include "trick/rand_generator.h"
+#include "trick/trick_math.h"

 double gauss_rnd_pseudo(        /* Return: random number */
                           RAND_GENERATOR * G)
--- a/trick_source/trick_utils/math/src/mat_copy.c
+++ b/trick_source/trick_utils/math/src/mat_copy.c
@ -5,7 +5,7 @@
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void mat_copy(                  /* Return: -- none */
                 double **copy, /* Out: copy of the matrix */
--- a/trick_source/trick_utils/math/src/mat_permute.c
+++ b/trick_source/trick_utils/math/src/mat_permute.c
@ -7,7 +7,7 @@

   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (September 93) (Trick-CR-xxxxx) (--))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void mat_permute(               /* Return: -- none */
                    double **A_coeff,   /* In: A_coeff */
--- a/trick_source/trick_utils/math/src/mat_print.c
+++ b/trick_source/trick_utils/math/src/mat_print.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void mat_print(double **mat,    /* In: Matrix to be printed */
               int n)
--- a/trick_source/trick_utils/math/src/mat_to_quat.c
+++ b/trick_source/trick_utils/math/src/mat_to_quat.c
@ -7,7 +7,7 @@

 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void mat_to_quat(double quat[4],        /* Out: Quaternion */
                 double a[3][3])
--- a/trick_source/trick_utils/math/src/mat_trans.c
+++ b/trick_source/trick_utils/math/src/mat_trans.c
@ -3,7 +3,7 @@
   ASSUMPTIONS AND LIMITATIONS: ((Square matrix))
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void mat_trans(double **trans,  /* Out: Product of the two matrices */
               double **mat,    /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/matxmat.c
+++ b/trick_source/trick_utils/math/src/matxmat.c
@ -3,7 +3,7 @@
   ASSUMPTIONS AND LIMITATIONS: ((Square matrix))
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void matxmat(double **prod,     /* Out: Product of the two matrices */
             double **mat1,     /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/matxtrans.c
+++ b/trick_source/trick_utils/math/src/matxtrans.c
@ -3,7 +3,7 @@
   ASSUMPTIONS AND LIMITATIONS: ((Square matrix))
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void matxtrans(double **prod,   /* Out: product of the two matrices */
               double **mat1,   /* In: matrix 1 */
--- a/trick_source/trick_utils/math/src/matxvec.c
+++ b/trick_source/trick_utils/math/src/matxvec.c
@ -3,7 +3,7 @@
   ASSUMPTIONS AND LIMITATIONS: ((Square matrix))
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release))) */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void matxvec(double *prod,      /* Out: product of the two matrices */
             double **mat,      /* In: matrix 1 */
--- a/trick_source/trick_utils/math/src/quat_mult.c
+++ b/trick_source/trick_utils/math/src/quat_mult.c
@ -8,7 +8,7 @@

 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void quat_mult(double q3[4],    /* Out: quaternion */
               double q1[4],    /* In: quaternion */
--- a/trick_source/trick_utils/math/src/quat_norm.c
+++ b/trick_source/trick_utils/math/src/quat_norm.c
@ -8,7 +8,7 @@

 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 void quat_norm(double q2[4],    /* Out: quaternion */
--- a/trick_source/trick_utils/math/src/quat_norm_integ.c
+++ b/trick_source/trick_utils/math/src/quat_norm_integ.c
@ -15,7 +15,7 @@

 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 void quat_norm_integ(double q2[4],      /* Out: normalized quaternion */
--- a/trick_source/trick_utils/math/src/quat_to_mat.c
+++ b/trick_source/trick_utils/math/src/quat_to_mat.c
@ -5,7 +5,7 @@

 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void quat_to_mat(double a[3][3],        /* Out: transformation matrix */
                 double quat[4])
--- a/trick_source/trick_utils/math/src/rand_num.c
+++ b/trick_source/trick_utils/math/src/rand_num.c
@ -11,7 +11,7 @@
   (Updates to put routines into trick math))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 double rand_num(RAND_GENERATOR * G)
 {                                      /* Inout: Generator parameters */
--- a/trick_source/trick_utils/math/src/roundoff.c
+++ b/trick_source/trick_utils/math/src/roundoff.c
@ -7,7 +7,7 @@
   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (Feb 1991) (v1.0) (Initial Release.)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 double roundoff(                /* Return: Value after roundoff */
                   double res,  /* In: Resolution for roundoff function */
--- a/trick_source/trick_utils/math/src/tm_print_error.c
+++ b/trick_source/trick_utils/math/src/tm_print_error.c
@ -4,7 +4,7 @@
 */

 #include <stdio.h>
-#include "../include/trick_math_error.h"
+#include "trick/trick_math_error.h"

 static char *trick_math_errors[] = {
    /* 00 */ "Success",
--- a/trick_source/trick_utils/math/src/transxmat.c
+++ b/trick_source/trick_utils/math/src/transxmat.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void transxmat(double **prod,   /* Out: Product of the two matrices */
               double **mat1,   /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/transxtrans.c
+++ b/trick_source/trick_utils/math/src/transxtrans.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void transxtrans(double **prod, /* Out: product of the two matrices */
                 double **mat1, /* In: matrix 1 */
--- a/trick_source/trick_utils/math/src/transxvec.c
+++ b/trick_source/trick_utils/math/src/transxvec.c
@ -4,7 +4,7 @@
   PROGRAMMERS: (((Les Quiocho) (NASA/JSC) (Jan 1993) (v1.0) (Init Release)))
 */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void transxvec(double *prod,    /* Out: Product of the two matrices */
               double **mat,    /* In: Matrix 1 */
--- a/trick_source/trick_utils/math/src/trick_gsl_rand.c
+++ b/trick_source/trick_utils/math/src/trick_gsl_rand.c
@ -7,14 +7,14 @@
 #include <stdio.h>
 #include <limits.h>
 #include <float.h>
-#include "../include/rand_generator.h"
-#include "sim_services/Message/include/message_proto.h"
-#include "sim_services/Message/include/message_type.h"
+#include "trick/rand_generator.h"
+#include "trick/message_proto.h"
+#include "trick/message_type.h"

 #if _HAVE_GSL
 #include "gsl/gsl_randist.h"
 #else
-#include "../include/trick_math_proto.h"
+#include "trick/trick_math_proto.h"
 #endif

 void trick_gsl_rand_init(TRICK_GSL_RANDIST * G)
--- a/trick_source/trick_utils/math/src/trns_fnct_1o.c
+++ b/trick_source/trick_utils/math/src/trns_fnct_1o.c
@ -13,7 +13,7 @@
   at current time based on initial in, initial out, current in and the transient coefficient -- first order
   differential equation. */

-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


    /* TOLERANCE FOR TIME CONSTANT AND DELTA TIME STEP */
--- a/trick_source/trick_utils/math/src/trns_fnct_2o.c
+++ b/trick_source/trick_utils/math/src/trns_fnct_2o.c
@ -6,7 +6,7 @@
   PROGRAMMERS: (((Robert W. Bailey) (LinCom Corp) (3/21/91) (Trick-CR-00000) (Development))) */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"

 void trns_fnct_2o(double *z,    /* In: damping ratio */
                  double *wn,   /* In: r/s Natural frequency in */
--- a/trick_source/trick_utils/math/src/uniform_rnd_1.c
+++ b/trick_source/trick_utils/math/src/uniform_rnd_1.c
@ -28,8 +28,8 @@
 #include <sys/times.h>
 #include <limits.h>
 #include <unistd.h>
-#include "../include/rand_generator.h"
-#include "../include/trick_math.h"
+#include "trick/rand_generator.h"
+#include "trick/trick_math.h"

 #ifndef HZ
 #define HZ 100                         /* This is a kludge to accomodate for Darwin. On Darwin HZ is actually a kernal
--- a/trick_source/trick_utils/math/src/uniform_rnd_triple.c
+++ b/trick_source/trick_utils/math/src/uniform_rnd_triple.c
@ -15,8 +15,8 @@
     ((Robert Gay) (Titan-LinCom) (Aug 2001) (--) (Updates to put routines into trick math)))
 */

-#include "../include/rand_generator.h"
-#include "../include/trick_math.h"
+#include "trick/rand_generator.h"
+#include "trick/trick_math.h"

 #define M1  259200
 #define IA1 7141
--- a/trick_source/trick_utils/math/src/vec_print.c
+++ b/trick_source/trick_utils/math/src/vec_print.c
@ -5,7 +5,7 @@
 */

 #include <stdio.h>
-#include "../include/trick_math.h"
+#include "trick/trick_math.h"


 void vec_print(double *vec,     /* In: Matrix to be printed */
--- a/trick_source/trick_utils/math/src/wave_form.c
+++ b/trick_source/trick_utils/math/src/wave_form.c
@ -19,8 +19,8 @@
 #include <sys/times.h>
 #endif

-#include "../include/wave_form.h"
-#include "../include/trick_math.h"
+#include "trick/wave_form.h"
+#include "trick/trick_math.h"

 #if ( __sun || __linux || __APPLE__ || __CYGWIN__ || __Lynx__ || __QNX__ || __ghs || __INTERIX )
 #define gettimeofday(T) gettimeofday(T,NULL)