JSBSim tweaks.

[flightgear.git] / src / FDM / JSBSim / Makefile.solo

diff --git a/src/FDM/JSBSim/Makefile.solo b/src/FDM/JSBSim/Makefile.solo
index 661c1dfb009ea043e057d7cd46dc7dd852f7adf1..67a54bb3ec25279e1c46f62157ca4c253fd87b1b 100644 (file)
--- a/src/FDM/JSBSim/Makefile.solo
+++ b/src/FDM/JSBSim/Makefile.solo
@@ -1,58 +1,104 @@
-JSBSim : 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 JSBSim.o
-       g++ $(CCOPTS) -lm *.o -oJSBSim
-FGAircraft.o : FGAircraft.cpp
-       g++ $(CCOPTS) -c FGAircraft.cpp
-FGAtmosphere.o : FGAtmosphere.cpp
-       g++ $(CCOPTS) -c FGAtmosphere.cpp
-FGAuxiliary.o : FGAuxiliary.cpp
-       g++ $(CCOPTS) -c FGAuxiliary.cpp
-FGCoefficient.o : FGCoefficient.cpp
-       g++ $(CCOPTS) -c FGCoefficient.cpp
-FGFCS.o : FGFCS.cpp
-       g++ $(CCOPTS) -c FGFCS.cpp
-FGFDMExec.o : FGFDMExec.cpp
-       g++ $(CCOPTS) -c FGFDMExec.cpp
-FGModel.o : FGModel.cpp
-       g++ $(CCOPTS) -c FGModel.cpp
-FGOutput.o : FGOutput.cpp
-       g++ $(CCOPTS) -c FGOutput.cpp
-FGPosition.o : FGPosition.cpp
-       g++ $(CCOPTS) -c FGPosition.cpp
-FGRotation.o : FGRotation.cpp
-       g++ $(CCOPTS) -c FGRotation.cpp
-FGState.o : FGState.cpp
-       g++ $(CCOPTS) -c FGState.cpp
-FGTranslation.o : FGTranslation.cpp
-       g++ $(CCOPTS) -c FGTranslation.cpp
-FGUtility.o : FGUtility.cpp
-       g++ $(CCOPTS) -c FGUtility.cpp
-FGEngine.o : FGEngine.cpp
-       g++ $(CCOPTS) -c FGEngine.cpp
-FGTank.o : FGTank.cpp
-       g++ $(CCOPTS) -c FGTank.cpp
-FGInitialCondition.o : FGInitialCondition.cpp
-       g++ $(CCOPTS) -c FGInitialCondition.cpp
-JSBSim.o : JSBSim.cpp
-       g++ $(CCOPTS) -c JSBSim.cpp
+CC = g++
+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
 
-clean:
-       mv *.*~ backup
-       rm *.o
+JSBSim : $(JSBSim_objects) JSBSim.o libFCSComponents.a
+       $(CC) $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) JSBSim.o -oJSBSim -lm -lFCSComponents
 
-all:
-       touch *.cpp
-       make JSBSim
+libFCSComponents.a :
+       cd filtersjb; make -fMakefile.solo; cd ..
 
-debug:
-       env CCOPTS=-g -WALL
-       make all
+FGAircraft.o : FGAircraft.cpp FGAircraft.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGAircraft.cpp
+
+FGAtmosphere.o : FGAtmosphere.cpp FGAtmosphere.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGAtmosphere.cpp
+
+FGAuxiliary.o : FGAuxiliary.cpp FGAuxiliary.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGAuxiliary.cpp
+
+FGCoefficient.o : FGCoefficient.cpp FGCoefficient.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGCoefficient.cpp
+
+FGFCS.o : FGFCS.cpp FGFCS.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGFCS.cpp
+
+FGFDMExec.o : FGFDMExec.cpp FGFDMExec.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGFDMExec.cpp
+
+FGModel.o : FGModel.cpp FGModel.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGModel.cpp
+
+FGOutput.o : FGOutput.cpp FGOutput.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGOutput.cpp
+
+FGPosition.o : FGPosition.cpp FGPosition.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGPosition.cpp
+
+FGRotation.o : FGRotation.cpp FGRotation.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGRotation.cpp
 
+FGState.o : FGState.cpp FGState.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGState.cpp
 
+FGTranslation.o : FGTranslation.cpp FGTranslation.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTranslation.cpp
 
+FGUtility.o : FGUtility.cpp FGUtility.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGUtility.cpp
 
+FGEngine.o : FGEngine.cpp FGEngine.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGEngine.cpp
 
+FGTank.o : FGTank.cpp FGTank.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTank.cpp
 
+FGInitialCondition.o : FGInitialCondition.cpp FGInitialCondition.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGInitialCondition.cpp
 
+FGfdmSocket.o : FGfdmSocket.cpp FGfdmSocket.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGfdmSocket.cpp
 
+FGConfigFile.o : FGConfigFile.cpp FGConfigFile.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGConfigFile.cpp
+
+FGLGear.o : FGLGear.cpp FGLGear.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGLGear.cpp
+
+FGMatrix.o : FGMatrix.cpp FGMatrix.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGMatrix.cpp
+  
+FGTrim.o : FGTrim.cpp FGTrim.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTrim.cpp
+  
+FGTrimAxis.o : FGTrimAxis.cpp FGTrimAxis.h
+       $(CC) $(INCLUDES) $(CCOPTS) -c FGTrimAxis.cpp
+
+x15trim.o : x15trim.cpp
+       $(CC) $(INCLUDES) $(CCOPTS) -c x15trim.cpp
+
+JSBSim.o : JSBSim.cpp
+       $(CC) $(INCLUDES) $(CCOPTS) -c JSBSim.cpp
+
+x15trim : $(JSBSim_objects) x15trim.o libFCSComponents.a
+       $(CC) $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) x15trim.o -ox15trim -lm -lFCSComponents
+  
+
+clean:
+       -mv *.*~ backup
+       -rm *.o
+
+all:
+       touch *.cpp
+       cd filtersjb; make all CCOPTS=-g -fMakefile.solo; cd ..
+       make JSBSim -fMakefile.solo
+
+debug:
+       touch *.cpp
+       touch filtersjb/*.cpp
+       cd filtersjb; make debug CCOPTS=-g -fMakefile.solo; cd ..
+       make JSBSim CCOPTS=-g -fMakefile.solo