Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

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

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 323190afd7cc26ae9a01ed785979d4b2e6ce8ae0..2d3b6414a0c2fd240e1a0aa17a5b80c0fcd95805 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -1,67 +1,9 @@
-SUBDIRS = filtersjb
-
-EXTRA_DIST = JSBSim.cpp Makefile.solo
+SUBDIRS = initialization models input_output math
 
 noinst_LIBRARIES = libJSBSim.a
 
-# FGGroundReactions.cpp FGGroundReactions.h \
-# FGPiston.cpp FGPiston.h \
-# FGPropulsion.cpp FGPropulsion.h \
-# FGRocket.cpp FGRocket.h \
-# FGTurboJet.cpp FGTurboJet.h \
-# FGTurboShaft.cpp FGTurboShaft.h \
-
-libJSBSim_a_SOURCES = \
-        FGAerodynamics.cpp FGAerodynamics.h \
-       FGAircraft.cpp FGAircraft.h \
-       FGAtmosphere.cpp FGAtmosphere.h \
-       FGAuxiliary.cpp FGAuxiliary.h \
-       FGCoefficient.cpp FGCoefficient.h \
-        FGColumnVector3.cpp FGColumnVector3.h \
-        FGColumnVector4.cpp FGColumnVector4.h \
-       FGConfigFile.cpp FGConfigFile.h \
-       FGDefs.h \
-       FGFCS.cpp FGFCS.h \
-       FGFDMExec.cpp FGFDMExec.h \
-       FGFactorGroup.cpp FGFactorGroup.h \
-       FGForce.cpp FGForce.h \
-        FGGroundReactions.cpp FGGroundReactions.h \
-        FGInertial.cpp FGInertial.h \
-       FGInitialCondition.cpp FGInitialCondition.h \
-        FGJSBBase.cpp FGJSBBase.h \
-       FGLGear.cpp FGLGear.h \
-        FGMassBalance.cpp FGMassBalance.h \
-       FGMatrix.cpp FGMatrix.h \
-        FGMatrix33.cpp FGMatrix33.h \
-       FGModel.cpp FGModel.h \
-       FGNozzle.cpp FGNozzle.h \
-       FGOutput.cpp FGOutput.h \
-        FGPiston.cpp FGPiston.h \
-        FGPropeller.cpp FGPropeller.h \
-        FGPropulsion.cpp FGPropulsion.h \
-       FGPosition.cpp FGPosition.h \
-       FGRotation.cpp FGRotation.h \
-       FGRocket.cpp FGRocket.h \
-       FGState.cpp FGState.h \
-       FGTable.cpp FGTable.h \
-       FGThruster.cpp FGThruster.h \
-       FGTranslation.cpp FGTranslation.h \
-       FGTrim.cpp FGTrim.h \
-       FGTrimAxis.cpp FGTrimAxis.h \
-       FGTurboJet.cpp FGTurboJet.h \
-       FGTurboProp.cpp FGTurboProp.h \
-       FGTurboShaft.cpp FGTurboShaft.h \
-       FGUtility.cpp FGUtility.h \
-       FGEngine.cpp FGEngine.h \
-       FGTank.cpp FGTank.h \
-       FGfdmSocket.cpp FGfdmSocket.h
-
-noinst_PROGRAMS = testJSBsim
-
-testJSBsim_SOURCES = JSBSim.cpp
-
-testJSBsim_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
+libJSBSim_a_SOURCES =  FGFDMExec.cpp FGJSBBase.cpp JSBSim.cxx
 
-INCLUDES += -I$(top_srcdir)/src
+noinst_HEADERS = FGFDMExec.h FGJSBBase.h JSBSim.hxx
 
-DEFS += -DFGFS
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim