Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group...

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

diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am
index f4cbd4e6bf127dbc51edb97d6a73d5b512b2b5d6..f75029429feed8959da3e35f5c7de644503e73d0 100644 (file)
--- a/src/FDM/YASim/Makefile.am
+++ b/src/FDM/YASim/Makefile.am
@@ -15,6 +15,7 @@ SHARED_SOURCE_FILES = \
         Gear.cpp Gear.hpp \
         Glue.cpp Glue.hpp \
         Ground.cpp Ground.hpp \
+        Hitch.cpp Hitch.hpp \
         Hook.cpp Hook.hpp \
         Launchbar.cpp Launchbar.hpp \
         Integrator.cpp Integrator.hpp \
@@ -23,12 +24,11 @@ SHARED_SOURCE_FILES = \
         Model.cpp Model.hpp \
         PropEngine.cpp PropEngine.hpp \
         Propeller.cpp Propeller.hpp \
-       Engine.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 \
@@ -46,9 +46,17 @@ 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)
+yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lsgtiming $(base_LIBS)
 
 proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
-proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
+proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lsgtiming $(base_LIBS)
+
+if HAVE_FRAMEWORK_OSG
+yasim_LDFLAGS = $(openthreads_FRAMEWORKS)
+proptest_LDFLAGS = $(openthreads_FRAMEWORKS)
+else
+yasim_LDFLAGS = $(openthreads_LIBS)
+proptest_LDFLAGS = $(openthreads_LIBS)
+endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src