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 5e89b59a335e6e4c8a15bc1fa91d3c4c83d6241c..2d3b6414a0c2fd240e1a0aa17a5b80c0fcd95805 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -1,39 +1,9 @@
-SUBDIRS = filtersjb
-
-EXTRA_DIST = JSBSim.cpp Makefile.solo
+SUBDIRS = initialization models input_output math
 
 noinst_LIBRARIES = libJSBSim.a
 
-libJSBSim_a_SOURCES = FGAircraft.cpp FGAircraft.h \
-       FGAtmosphere.cpp FGAtmosphere.h \
-       FGAuxiliary.cpp FGAuxiliary.h \
-       FGCoefficient.cpp FGCoefficient.h \
-       FGConfigFile.cpp FGConfigFile.h \
-       FGControls.cpp FGControls.h \
-       FGDefs.h \
-       FGFCS.cpp FGFCS.h \
-       FGFDMExec.cpp FGFDMExec.h \
-       FGInitialCondition.cpp FGInitialCondition.h \
-       FGLGear.cpp FGLGear.h \
-       FGMatrix.cpp FGMatrix.h \
-       FGModel.cpp FGModel.h \
-       FGOutput.cpp FGOutput.h \
-       FGPosition.cpp FGPosition.h \
-       FGRotation.cpp FGRotation.h \
-       FGState.cpp FGState.h \
-       FGTranslation.cpp FGTranslation.h \
-       FGTrimLong.cpp FGTrimLong.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_builddir)/src
+noinst_HEADERS = FGFDMExec.h FGJSBBase.h JSBSim.hxx
 
-DEFS += -DFGFS
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim