Curt Olson:

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

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index a141990dd9c113316d6e3a94604a05f9e0db2485..205809e23ad43408bfa9df04386c59c0b9369c10 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -1,18 +1,11 @@
 SUBDIRS = filtersjb
 
-EXTRA_DIST = JSBSim.cpp Makefile.solo
+EXTRA_DIST = Makefile.solo
 
 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 \
+       FGAerodynamics.cpp FGAerodynamics.h \
        FGAircraft.cpp FGAircraft.h \
        FGAtmosphere.cpp FGAtmosphere.h \
        FGAuxiliary.cpp FGAuxiliary.h \
@@ -31,7 +24,6 @@ libJSBSim_a_SOURCES = \
         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 \
@@ -49,29 +41,19 @@ libJSBSim_a_SOURCES = \
        FGTranslation.cpp FGTranslation.h \
        FGTrim.cpp FGTrim.h \
        FGTrimAxis.cpp FGTrimAxis.h \
-       FGTurboJet.cpp FGTurboJet.h \
-       FGTurboProp.cpp FGTurboProp.h \
-       FGTurboShaft.cpp FGTurboShaft.h \
+       FGTurbine.cpp FGTurbine.h \
        FGUtility.cpp FGUtility.h \
        FGEngine.cpp FGEngine.h \
        FGTank.cpp FGTank.h \
-       FGfdmSocket.cpp FGfdmSocket.h
-
-noinst_PROGRAMS = testJSBsim # demo
-
-testJSBsim_SOURCES = JSBSim.cpp
+       FGfdmSocket.cpp FGfdmSocket.h \
+       FGTurbine.cpp FGTurbine.h \
+       FGPropertyManager.cpp FGPropertyManager.h  \
+       FGSimTurbine.cpp FGSimTurbine.h \
+       JSBSim.cxx JSBSim.hxx
 
-testJSBsim_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
 
-# demo_SOURCES = demo.cxx
+# noinst_PROGRAMS = testJSBsim
 
-# demo_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
-
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-DEFS += -DFGFS
-else
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 AM_CXXFLAGS = -DFGFS
-endif
 
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src