Updates.

diff --git a/src/FDM/JSBSim/FGCoefficient.h b/src/FDM/JSBSim/FGCoefficient.h
index e279f6b17f155bb10d106bd811f2aa55343e6b84..80487135a6ff8ab1d0ebf5930d2165ed50ff962d 100644 (file)
--- a/src/FDM/JSBSim/FGCoefficient.h
+++ b/src/FDM/JSBSim/FGCoefficient.h
@@ -117,6 +117,7 @@ public:
   virtual void DisplayCoeffFactors(void);
   virtual inline string GetCoefficientStrings(void) { return name; }
   virtual string GetCoefficientValues(void);
+
 private:
   enum Type {UNKNOWN, VALUE, VECTOR, TABLE, EQUATION};
 
@@ -147,7 +148,7 @@ private:
   FGAuxiliary*    Auxiliary;
   FGOutput*       Output;
 
-  void Debug(void);
+  virtual void Debug(void);
 };
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/FDM/JSBSim/FGFactorGroup.cpp b/src/FDM/JSBSim/FGFactorGroup.cpp
index fa80b1ed51f2947724097eb0207494b198982de8..c6cfdc49924bb06cdcc1655bf8384f412ab749bf 100644 (file)
--- a/src/FDM/JSBSim/FGFactorGroup.cpp
+++ b/src/FDM/JSBSim/FGFactorGroup.cpp
@@ -65,17 +65,21 @@ static const char *IdHdr = ID_FACTORGROUP;
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-FGFactorGroup::FGFactorGroup( FGFDMExec* fdmex ) : FGCoefficient( fdmex) {
+FGFactorGroup::FGFactorGroup( FGFDMExec* fdmex ) : FGCoefficient( fdmex)
+{
   FDMExec=fdmex;
+  if (debug_lvl & 2) cout << "Instantiated: FGFactorGroup" << endl;
 }  
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
                           
-FGFactorGroup::~FGFactorGroup() {
-    int i;
-    for (i=0; i<sum.size(); i++) {
-      delete sum[i];
-    }
+FGFactorGroup::~FGFactorGroup()
+{
+  int i;
+  for (i=0; i<sum.size(); i++) {
+    delete sum[i];
+  }
+  if (debug_lvl & 2) cout << "Destroyed:    FGFactorGroup" << endl;
 }
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -118,8 +122,7 @@ float FGFactorGroup::TotalValue(void) {
   }
   totalsum *= FGCoefficient::TotalValue();
   SDtotal *= FGCoefficient::GetSD();
-//   cout << "FGCoefficient::GetSD(): " << FGCoefficient::GetSD() << endl;
-//   cout << "FGFactorGroup::SDtotal: " << SDtotal << endl;
+  if (debug_lvl & 8) Debug();
   return totalsum;
 }        
 
@@ -157,4 +160,12 @@ string FGFactorGroup::GetCoefficientValues(void) {
     }
     return values;
 }       
-       
+
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+void FGFactorGroup::Debug(void)
+{
+  cout << "FGCoefficient::GetSD(): " << FGCoefficient::GetSD() << endl;
+  cout << "FGFactorGroup::SDtotal: " << SDtotal << endl;
+}
+

diff --git a/src/FDM/JSBSim/FGFactorGroup.h b/src/FDM/JSBSim/FGFactorGroup.h
index 6d2145a69ce37fe21dab758407ff1b0c01fde520..38a08c0784e849df55f8f7c160da446876e0e9c2 100644 (file)
--- a/src/FDM/JSBSim/FGFactorGroup.h
+++ b/src/FDM/JSBSim/FGFactorGroup.h
@@ -102,7 +102,7 @@ class FGFactorGroup: public FGCoefficient {
     float TotalValue(void);
     string GetCoefficientStrings(void);
     string GetCoefficientValues(void);
-    inline float GetSD(void) { return SDtotal; };
+    inline float GetSD(void) { return SDtotal; }
     inline float GetFactorSD(void) { return FGCoefficient::GetSD(); }
     
   private:
@@ -112,7 +112,7 @@ class FGFactorGroup: public FGCoefficient {
     typedef vector<FGCoefficient*> CoeffArray;
     CoeffArray sum;
     float SDtotal;
-        
-};    
+    void Debug(void);
+};
     
 #endif 

diff --git a/src/FDM/JSBSim/FGMatrix.cpp b/src/FDM/JSBSim/FGMatrix.cpp
index d59ff81fb5ba691ca8aea56741f01766a99ab729..6edc4f3f66e26428feb10fe5e6d81c63eb839271 100644 (file)
--- a/src/FDM/JSBSim/FGMatrix.cpp
+++ b/src/FDM/JSBSim/FGMatrix.cpp
@@ -129,18 +129,16 @@ istream& operator>>(istream& is, FGMatrix& M)
 FGMatrix& FGMatrix::operator=(const FGMatrix& M)
 {
   if (&M != this) {
-    if (data != NULL) dealloc(data,rows);
-
-    width  = M.width;
-    prec   = M.prec;
-    delim  = M.delim;
-    origin = M.origin;
-    rows   = M.rows;
-    cols   = M.cols;
-
-    data = FGalloc(rows,cols);
-    for (unsigned int i=0; i<=rows; i++) {
-      for (unsigned int j=0; j<=cols; j++) {
+    if (M.rows != rows || M.cols != cols) {
+      if (data != NULL) dealloc(data,rows);
+
+      rows   = M.rows;
+      cols   = M.cols;
+
+      data = FGalloc(rows,cols);
+    }
+    for (unsigned int i=1; i<=rows; i++) {
+      for (unsigned int j=1; j<=cols; j++) {
         data[i][j] = M.data[i][j];
       }
     }
@@ -166,10 +164,6 @@ unsigned int FGMatrix::Cols(void) const
 
 void FGMatrix::SetOParams(char delim,int width,int prec,int origin)
 {
-  FGMatrix::delim  = delim;
-  FGMatrix::width  = width;
-  FGMatrix::prec   = prec;
-  FGMatrix::origin = origin;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/FDM/JSBSim/Makefile.solo b/src/FDM/JSBSim/Makefile.solo
index 67a54bb3ec25279e1c46f62157ca4c253fd87b1b..b1a10450bd782fff0dd4d78179a57f1fcca258bb 100644 (file)
--- a/src/FDM/JSBSim/Makefile.solo
+++ b/src/FDM/JSBSim/Makefile.solo
@@ -3,90 +3,399 @@ INCLUDES = -I.
 LINKDIR= -Lfiltersjb/
 JSBSim_objects = FGAircraft.o FGAtmosphere.o FGCoefficient.o FGFCS.o FGFDMExec.o\
 FGModel.o FGOutput.o FGPosition.o FGRotation.o FGState.o FGTranslation.o\
-FGUtility.o FGEngine.o FGTank.o FGAuxiliary.o FGfdmSocket.o FGTrim.o FGTrimAxis.o\
-FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix.o
+FGUtility.o FGTank.o FGAuxiliary.o FGfdmSocket.o FGTrim.o FGTrimAxis.o\
+FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix.o FGPropulsion.o FGRocket.o\
+FGTurboShaft.o FGTurboJet.o FGTurboProp.o FGPiston.o FGForce.o FGThruster.o FGEngine.o\
+FGTable.o FGPropeller.o FGNozzle.o FGAerodynamics.o FGMassBalance.o FGInertial.o\
+FGFactorGroup.o
 
 JSBSim : $(JSBSim_objects) JSBSim.o libFCSComponents.a
        $(CC) $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) JSBSim.o -oJSBSim -lm -lFCSComponents
 
-libFCSComponents.a :
+libFCSComponents.a:
        cd filtersjb; make -fMakefile.solo; cd ..
 
-FGAircraft.o : FGAircraft.cpp FGAircraft.h
+FGAerodynamics.o: FGAerodynamics.cpp FGAerodynamics.h FGModel.h \
+ FGDefs.h FGConfigFile.h FGState.h FGInitialCondition.h FGFDMExec.h \
+ FGAtmosphere.h FGMatrix.h FGFCS.h filtersjb/FGFCSComponent.h \
+ filtersjb/../FGDefs.h filtersjb/../FGFCS.h FGLGear.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGRotation.h \
+ FGPosition.h FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGTable.h FGNozzle.h FGMassBalance.h \
+ FGCoefficient.h FGFactorGroup.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGAerodynamics.cpp
+
+FGAircraft.o: FGAircraft.cpp FGAircraft.h FGModel.h FGDefs.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGState.h FGInitialCondition.h \
+ FGFDMExec.h FGAtmosphere.h FGMatrix.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGTranslation.h FGAerodynamics.h FGCoefficient.h FGTable.h \
+ FGFactorGroup.h FGOutput.h FGfdmSocket.h FGAuxiliary.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGNozzle.h FGInertial.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGAircraft.cpp
 
-FGAtmosphere.o : FGAtmosphere.cpp FGAtmosphere.h
+FGAtmosphere.o: FGAtmosphere.cpp FGAtmosphere.h FGModel.h FGDefs.h \
+ FGMatrix.h FGState.h FGInitialCondition.h FGFDMExec.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGAircraft.h FGPropulsion.h FGRocket.h \
+ FGEngine.h FGTranslation.h FGRotation.h FGPosition.h FGAuxiliary.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGAtmosphere.cpp
 
-FGAuxiliary.o : FGAuxiliary.cpp FGAuxiliary.h
+FGAuxiliary.o: FGAuxiliary.cpp FGAuxiliary.h FGModel.h FGDefs.h \
+ FGMatrix.h FGTranslation.h FGRotation.h FGAtmosphere.h FGState.h \
+ FGInitialCondition.h FGFDMExec.h FGFCS.h filtersjb/FGFCSComponent.h \
+ filtersjb/../FGDefs.h filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h \
+ FGAircraft.h FGPropulsion.h FGRocket.h FGEngine.h FGPosition.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGAuxiliary.cpp
 
-FGCoefficient.o : FGCoefficient.cpp FGCoefficient.h
+FGCoefficient.o: FGCoefficient.cpp FGCoefficient.h FGConfigFile.h \
+ FGDefs.h FGTable.h FGState.h FGInitialCondition.h FGFDMExec.h \
+ FGModel.h FGAtmosphere.h FGMatrix.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGAircraft.h FGPropulsion.h FGRocket.h FGEngine.h \
+ FGTranslation.h FGRotation.h FGPosition.h FGAuxiliary.h FGOutput.h \
+ FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h FGTurboProp.h \
+ FGTank.h FGPropeller.h FGThruster.h FGForce.h FGNozzle.h \
+ FGMassBalance.h FGAerodynamics.h FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGCoefficient.cpp
 
-FGFCS.o : FGFCS.cpp FGFCS.h
+FGColumnVector3.o: FGColumnVector3.cpp FGColumnVector3.h FGMatrix.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGColumnVector3.cpp
+
+FGConfigFile.o: FGConfigFile.cpp FGConfigFile.h FGDefs.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGConfigFile.cpp
+
+FGEngine.o: FGEngine.cpp FGEngine.h FGState.h FGDefs.h \
+ FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h FGMatrix.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGTranslation.h FGNozzle.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGEngine.cpp
+
+FGFCS.o: FGFCS.cpp FGDefs.h FGFCS.h filtersjb/FGFCSComponent.h \
+ filtersjb/../FGDefs.h filtersjb/../FGFCS.h FGModel.h FGLGear.h \
+ FGConfigFile.h FGMatrix.h FGFDMExec.h FGInitialCondition.h \
+ FGAtmosphere.h FGAircraft.h FGPropulsion.h FGRocket.h FGEngine.h \
+ FGState.h FGTranslation.h FGRotation.h FGPosition.h FGAerodynamics.h \
+ FGMassBalance.h FGCoefficient.h FGTable.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h \
+ FGNozzle.h filtersjb/FGFilter.h filtersjb/../FGConfigFile.h \
+ filtersjb/FGDeadBand.h filtersjb/FGGain.h filtersjb/../FGTable.h \
+ filtersjb/FGGradient.h filtersjb/FGSwitch.h filtersjb/FGSummer.h \
+ filtersjb/FGFlaps.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGFCS.cpp
 
-FGFDMExec.o : FGFDMExec.cpp FGFDMExec.h
+FGFDMExec.o: FGFDMExec.cpp FGFDMExec.h FGModel.h FGDefs.h \
+ FGInitialCondition.h FGAtmosphere.h FGMatrix.h FGState.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGAircraft.h FGPropulsion.h FGRocket.h \
+ FGEngine.h FGTranslation.h FGRotation.h FGPosition.h FGAuxiliary.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h FGInertial.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGFDMExec.cpp
 
-FGModel.o : FGModel.cpp FGModel.h
+FGFactorGroup.o: FGFactorGroup.cpp FGCoefficient.h FGConfigFile.h \
+ FGDefs.h FGTable.h FGFactorGroup.h FGAerodynamics.h FGModel.h \
+ FGState.h FGInitialCondition.h FGFDMExec.h FGAtmosphere.h FGMatrix.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGAircraft.h FGPropulsion.h FGRocket.h \
+ FGEngine.h FGTranslation.h FGRotation.h FGPosition.h FGAuxiliary.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h \
+ FGNozzle.h FGMassBalance.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGFactorGroup.cpp
+
+FGForce.o: FGForce.cpp FGFDMExec.h FGModel.h FGDefs.h \
+ FGInitialCondition.h FGAtmosphere.h FGMatrix.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGState.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGTranslation.h FGAerodynamics.h FGCoefficient.h FGTable.h \
+ FGFactorGroup.h FGOutput.h FGfdmSocket.h FGAuxiliary.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGNozzle.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGForce.cpp
+
+FGGroundReactions.o: FGGroundReactions.cpp FGGroundReactions.h \
+ FGModel.h FGDefs.h FGConfigFile.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGGroundReactions.cpp
+
+FGInertial.o: FGInertial.cpp FGInertial.h FGModel.h FGDefs.h \
+ FGConfigFile.h FGMatrix.h FGPosition.h FGMassBalance.h FGPropulsion.h \
+ FGRocket.h FGEngine.h FGState.h FGInitialCondition.h FGFDMExec.h \
+ FGAtmosphere.h FGFCS.h filtersjb/FGFCSComponent.h \
+ filtersjb/../FGDefs.h filtersjb/../FGFCS.h FGLGear.h FGAircraft.h \
+ FGRotation.h FGTranslation.h FGAerodynamics.h FGCoefficient.h \
+ FGTable.h FGFactorGroup.h FGOutput.h FGfdmSocket.h FGAuxiliary.h \
+ FGPiston.h FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h \
+ FGPropeller.h FGThruster.h FGForce.h FGNozzle.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGInertial.cpp
+
+FGInitialCondition.o: FGInitialCondition.cpp FGInitialCondition.h \
+ FGFDMExec.h FGModel.h FGDefs.h FGAtmosphere.h FGMatrix.h FGState.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGRotation.h \
+ FGPosition.h FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGTable.h FGNozzle.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGInitialCondition.cpp
+
+FGLGear.o: FGLGear.cpp FGLGear.h FGConfigFile.h FGDefs.h FGMatrix.h \
+ FGFDMExec.h FGModel.h FGInitialCondition.h FGAtmosphere.h \
+ FGAircraft.h FGPropulsion.h FGRocket.h FGEngine.h FGState.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGTranslation.h FGRotation.h FGPosition.h FGAerodynamics.h \
+ FGMassBalance.h FGCoefficient.h FGTable.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h \
+ FGNozzle.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGLGear.cpp
+
+FGMassBalance.o: FGMassBalance.cpp FGMassBalance.h FGModel.h FGDefs.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGState.h FGInitialCondition.h \
+ FGFDMExec.h FGAtmosphere.h FGMatrix.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGAircraft.h FGPosition.h FGRotation.h \
+ FGTranslation.h FGAerodynamics.h FGCoefficient.h FGTable.h \
+ FGFactorGroup.h FGOutput.h FGfdmSocket.h FGAuxiliary.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGNozzle.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGMassBalance.cpp
+
+FGMatrix.o: FGMatrix.cpp FGMatrix.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGMatrix.cpp
+
+FGModel.o: FGModel.cpp FGModel.h FGDefs.h FGState.h \
+ FGInitialCondition.h FGFDMExec.h FGAtmosphere.h FGMatrix.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGAircraft.h FGPropulsion.h FGRocket.h \
+ FGEngine.h FGTranslation.h FGRotation.h FGPosition.h FGAuxiliary.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h FGInertial.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGModel.cpp
 
-FGOutput.o : FGOutput.cpp FGOutput.h
+FGNozzle.o: FGNozzle.cpp FGNozzle.h FGThruster.h FGForce.h FGFDMExec.h \
+ FGModel.h FGDefs.h FGInitialCondition.h FGAtmosphere.h FGMatrix.h \
+ FGConfigFile.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGNozzle.cpp
+
+FGOutput.o: FGOutput.cpp FGOutput.h FGModel.h FGDefs.h FGfdmSocket.h \
+ FGState.h FGInitialCondition.h FGFDMExec.h FGAtmosphere.h FGMatrix.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGRotation.h \
+ FGPosition.h FGAuxiliary.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGOutput.cpp
 
-FGPosition.o : FGPosition.cpp FGPosition.h
+FGPiston.o: FGPiston.cpp FGDefs.h FGPiston.h FGEngine.h FGState.h \
+ FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h FGMatrix.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGTurboShaft.h FGTurboJet.h FGTurboProp.h \
+ FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGTranslation.h FGNozzle.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGPiston.cpp
+
+FGPosition.o: FGPosition.cpp FGPosition.h FGModel.h FGDefs.h \
+ FGMatrix.h FGAtmosphere.h FGState.h FGInitialCondition.h FGFDMExec.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGRotation.h \
+ FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h \
+ FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h \
+ FGForce.h FGTable.h FGNozzle.h FGMassBalance.h FGAerodynamics.h \
+ FGCoefficient.h FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGPosition.cpp
 
-FGRotation.o : FGRotation.cpp FGRotation.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGRotation.cpp
+FGPropeller.o: FGPropeller.cpp FGPropeller.h FGThruster.h FGForce.h \
+ FGFDMExec.h FGModel.h FGDefs.h FGInitialCondition.h FGAtmosphere.h \
+ FGMatrix.h FGConfigFile.h FGTable.h FGTranslation.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGPropeller.cpp
 
-FGState.o : FGState.cpp FGState.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGState.cpp
+FGPropulsion.o: FGPropulsion.cpp FGPropulsion.h FGModel.h FGDefs.h \
+ FGRocket.h FGEngine.h FGState.h FGInitialCondition.h FGFDMExec.h \
+ FGAtmosphere.h FGMatrix.h FGFCS.h filtersjb/FGFCSComponent.h \
+ filtersjb/../FGDefs.h filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h \
+ FGAircraft.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGTranslation.h FGAerodynamics.h FGCoefficient.h FGTable.h \
+ FGFactorGroup.h FGOutput.h FGfdmSocket.h FGAuxiliary.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGNozzle.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGPropulsion.cpp
 
-FGTranslation.o : FGTranslation.cpp FGTranslation.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGTranslation.cpp
+FGRocket.o: FGRocket.cpp FGDefs.h FGRocket.h FGEngine.h FGState.h \
+ FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h FGMatrix.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGPiston.h FGTurboShaft.h FGTurboJet.h FGTurboProp.h \
+ FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGTranslation.h FGNozzle.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGRocket.cpp
 
-FGUtility.o : FGUtility.cpp FGUtility.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGUtility.cpp
+FGRotation.o: FGRotation.cpp FGRotation.h FGModel.h FGDefs.h \
+ FGMatrix.h FGAtmosphere.h FGState.h FGInitialCondition.h FGFDMExec.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGPosition.h \
+ FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h \
+ FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h \
+ FGForce.h FGTable.h FGNozzle.h FGMassBalance.h FGAerodynamics.h \
+ FGCoefficient.h FGFactorGroup.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGRotation.cpp
 
-FGEngine.o : FGEngine.cpp FGEngine.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGEngine.cpp
+FGRotor.o: FGRotor.cpp FGRotor.h FGThruster.h FGForce.h FGFDMExec.h \
+ FGModel.h FGDefs.h FGInitialCondition.h FGAtmosphere.h FGMatrix.h \
+ FGConfigFile.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGRotor.cpp
 
-FGTank.o : FGTank.cpp FGTank.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGTank.cpp
+FGState.o: FGState.cpp FGState.h FGDefs.h FGInitialCondition.h \
+ FGFDMExec.h FGModel.h FGAtmosphere.h FGMatrix.h FGFCS.h \
+ filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h filtersjb/../FGFCS.h \
+ FGLGear.h FGConfigFile.h FGAircraft.h FGPropulsion.h FGRocket.h \
+ FGEngine.h FGTranslation.h FGRotation.h FGPosition.h FGAuxiliary.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGState.cpp
 
-FGInitialCondition.o : FGInitialCondition.cpp FGInitialCondition.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGInitialCondition.cpp
+FGTable.o: FGTable.cpp FGTable.h FGConfigFile.h FGDefs.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTable.cpp
 
-FGfdmSocket.o : FGfdmSocket.cpp FGfdmSocket.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGfdmSocket.cpp
+FGTank.o: FGTank.cpp FGDefs.h FGTank.h FGConfigFile.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTank.cpp
 
-FGConfigFile.o : FGConfigFile.cpp FGConfigFile.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGConfigFile.cpp
+FGThruster.o: FGThruster.cpp FGThruster.h FGForce.h FGFDMExec.h \
+ FGModel.h FGDefs.h FGInitialCondition.h FGAtmosphere.h FGMatrix.h \
+ FGConfigFile.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGThruster.cpp
 
-FGLGear.o : FGLGear.cpp FGLGear.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGLGear.cpp
+FGTranslation.o: FGTranslation.cpp FGTranslation.h FGModel.h FGDefs.h \
+ FGMatrix.h FGRotation.h FGAtmosphere.h FGState.h FGInitialCondition.h \
+ FGFDMExec.h FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGPosition.h FGAuxiliary.h \
+ FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGNozzle.h FGMassBalance.h FGAerodynamics.h FGCoefficient.h \
+ FGFactorGroup.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTranslation.cpp
 
-FGMatrix.o : FGMatrix.cpp FGMatrix.h
-       $(CC) $(INCLUDES) $(CCOPTS) -c FGMatrix.cpp
-  
-FGTrim.o : FGTrim.cpp FGTrim.h
+FGTrim.o: FGTrim.cpp FGFDMExec.h FGModel.h FGDefs.h \
+ FGInitialCondition.h FGAtmosphere.h FGMatrix.h FGTrim.h FGRotation.h \
+ FGState.h FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGPosition.h \
+ FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h \
+ FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h \
+ FGForce.h FGTable.h FGNozzle.h FGMassBalance.h FGAerodynamics.h \
+ FGCoefficient.h FGFactorGroup.h FGTrimAxis.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGTrim.cpp
-  
-FGTrimAxis.o : FGTrimAxis.cpp FGTrimAxis.h
+
+FGTrimAxis.o: FGTrimAxis.cpp FGFDMExec.h FGModel.h FGDefs.h \
+ FGInitialCondition.h FGAtmosphere.h FGMatrix.h FGTrimAxis.h \
+ FGRotation.h FGState.h FGFCS.h filtersjb/FGFCSComponent.h \
+ filtersjb/../FGDefs.h filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h \
+ FGAircraft.h FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h \
+ FGPosition.h FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGTable.h FGNozzle.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c FGTrimAxis.cpp
 
-x15trim.o : x15trim.cpp
-       $(CC) $(INCLUDES) $(CCOPTS) -c x15trim.cpp
+FGTurboJet.o: FGTurboJet.cpp FGTurboJet.h FGEngine.h FGState.h \
+ FGDefs.h FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h \
+ FGMatrix.h FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGPiston.h FGTurboShaft.h FGTurboProp.h \
+ FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGTranslation.h FGNozzle.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTurboJet.cpp
+
+FGTurboProp.o: FGTurboProp.cpp FGTurboProp.h FGEngine.h FGState.h \
+ FGDefs.h FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h \
+ FGMatrix.h FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGPiston.h FGTurboShaft.h FGTurboJet.h \
+ FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGTranslation.h FGNozzle.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTurboProp.cpp
+
+FGTurboShaft.o: FGTurboShaft.cpp FGTurboShaft.h FGEngine.h FGState.h \
+ FGDefs.h FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h \
+ FGMatrix.h FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGPiston.h FGTurboJet.h FGTurboProp.h \
+ FGTank.h FGPropeller.h FGThruster.h FGForce.h FGTable.h \
+ FGTranslation.h FGNozzle.h FGPosition.h FGRotation.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h FGOutput.h \
+ FGfdmSocket.h FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTurboShaft.cpp
+
+FGUtility.o: FGUtility.cpp FGUtility.h FGState.h FGDefs.h \
+ FGInitialCondition.h FGFDMExec.h FGModel.h FGAtmosphere.h FGMatrix.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGRotation.h \
+ FGPosition.h FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h \
+ FGTurboShaft.h FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h \
+ FGThruster.h FGForce.h FGTable.h FGNozzle.h FGMassBalance.h \
+ FGAerodynamics.h FGCoefficient.h FGFactorGroup.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGUtility.cpp
 
-JSBSim.o : JSBSim.cpp
+FGfdmSocket.o: FGfdmSocket.cpp FGfdmSocket.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGfdmSocket.cpp
+
+JSBSim.o: JSBSim.cpp FGFDMExec.h FGModel.h FGDefs.h \
+ FGInitialCondition.h FGAtmosphere.h FGMatrix.h FGRotation.h FGState.h \
+ FGFCS.h filtersjb/FGFCSComponent.h filtersjb/../FGDefs.h \
+ filtersjb/../FGFCS.h FGLGear.h FGConfigFile.h FGAircraft.h \
+ FGPropulsion.h FGRocket.h FGEngine.h FGTranslation.h FGPosition.h \
+ FGAuxiliary.h FGOutput.h FGfdmSocket.h FGPiston.h FGTurboShaft.h \
+ FGTurboJet.h FGTurboProp.h FGTank.h FGPropeller.h FGThruster.h \
+ FGForce.h FGTable.h FGNozzle.h FGMassBalance.h FGAerodynamics.h \
+ FGCoefficient.h FGFactorGroup.h
        $(CC) $(INCLUDES) $(CCOPTS) -c JSBSim.cpp
 
-x15trim : $(JSBSim_objects) x15trim.o libFCSComponents.a
+
+x15trim.o:x15trim.cpp
+       $(CC) $(INCLUDES) $(CCOPTS) -c x15trim.cpp
+
+x15trim:$(JSBSim_objects) x15trim.o libFCSComponents.a
        $(CC) $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) x15trim.o -ox15trim -lm -lFCSComponents
-  
 
 clean:
        -mv *.*~ backup
@@ -94,7 +403,7 @@ clean:
 
 all:
        touch *.cpp
-       cd filtersjb; make all CCOPTS=-g -fMakefile.solo; cd ..
+       cd filtersjb; make all -fMakefile.solo; cd ..
        make JSBSim -fMakefile.solo
 
 debug: