First steps in a weather reorganization. Note especially that

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

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 323190afd7cc26ae9a01ed785979d4b2e6ce8ae0..6bc440a3918b5d6620ef13be05ac8b4c097f2ff5 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -31,7 +31,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 \
@@ -42,6 +41,7 @@ libJSBSim_a_SOURCES = \
        FGPosition.cpp FGPosition.h \
        FGRotation.cpp FGRotation.h \
        FGRocket.cpp FGRocket.h \
+       FGScript.cpp FGScript.h \
        FGState.cpp FGState.h \
        FGTable.cpp FGTable.h \
        FGThruster.cpp FGThruster.h \
@@ -56,12 +56,21 @@ libJSBSim_a_SOURCES = \
        FGTank.cpp FGTank.h \
        FGfdmSocket.cpp FGfdmSocket.h
 
-noinst_PROGRAMS = testJSBsim
+noinst_PROGRAMS = testJSBsim # demo
 
 testJSBsim_SOURCES = JSBSim.cpp
 
 testJSBsim_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
 
-INCLUDES += -I$(top_srcdir)/src
+# demo_SOURCES = demo.cxx
 
+# 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
+