Encapsulate the interpolstion version of FGEnvironment and fix some bugs

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

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 4c3ef6b778c1f60923cb0233daeb0b9e9f5527b1..205809e23ad43408bfa9df04386c59c0b9369c10 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = filtersjb tests
+SUBDIRS = filtersjb
 
 EXTRA_DIST = Makefile.solo
 
 noinst_LIBRARIES = libJSBSim.a
 
 libJSBSim_a_SOURCES = \
-        FGAerodynamics.cpp FGAerodynamics.h \
+       FGAerodynamics.cpp FGAerodynamics.h \
        FGAircraft.cpp FGAircraft.h \
        FGAtmosphere.cpp FGAtmosphere.h \
        FGAuxiliary.cpp FGAuxiliary.h \
@@ -41,23 +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 \
+       FGTurbine.cpp FGTurbine.h \
+       FGPropertyManager.cpp FGPropertyManager.h  \
+       FGSimTurbine.cpp FGSimTurbine.h \
        JSBSim.cxx JSBSim.hxx
 
 
 # noinst_PROGRAMS = testJSBsim
 
-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