Constant-speed props were seeking to engine speed, not prop speed.

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

diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am
index 196acd359b454fcb9819994472e62230c2b705e8..dd949c08ff651b6ccee2830f882753e260563ddc 100644 (file)
--- a/src/FDM/YASim/Makefile.am
+++ b/src/FDM/YASim/Makefile.am
@@ -1,7 +1,12 @@
-noinst_LIBRARIES = libYASim.a
+# Link the yasim executable against the individual object files rather
+# than libYASim.  The library references other stuff in FlightGear,
+# and some linkers (Irix) do dependency checks per-library instead of
+# per-object.
+#
+# I think that it's permissible to list the same source files more
+# than once in a Makefile.am.  Hopefully this doesn't break anything.
 
-libYASim_a_SOURCES = \
-        YASim.cxx YASim.hxx \
+SHARED_SOURCE_FILES = \
         Airplane.cpp Airplane.hpp \
         Atmosphere.cpp Atmosphere.hpp \
         BodyEnvironment.hpp \
@@ -13,14 +18,34 @@ libYASim_a_SOURCES = \
         Jet.cpp Jet.hpp \
         Math.cpp Math.hpp \
         Model.cpp Model.hpp \
-        PistonEngine.cpp PistonEngine.hpp \
         PropEngine.cpp PropEngine.hpp \
         Propeller.cpp Propeller.hpp \
+       Engine.hpp \
+        PistonEngine.cpp PistonEngine.hpp \
+        TurbineEngine.cpp TurbineEngine.hpp \
         RigidBody.cpp RigidBody.hpp \
+        Rotor.cpp Rotor.hpp \
+        Rotorblade.cpp Rotorblade.hpp \
+        Rotorpart.cpp Rotorpart.hpp \
         SimpleJet.cpp SimpleJet.hpp \
         Surface.cpp Surface.hpp \
         Thruster.cpp Thruster.hpp \
         Vector.hpp \
-        Wing.cpp Wing.hpp
+        Wing.cpp Wing.hpp \
+        Turbulence.cpp Turbulence.hpp
+
+noinst_LIBRARIES = libYASim.a
+
+libYASim_a_SOURCES = YASim.cxx YASim.hxx $(SHARED_SOURCE_FILES)
+
+bin_PROGRAMS = yasim
+noinst_PROGRAMS = proptest
+
+yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
+
+yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
+
+proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
+proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src