Latest JSBSim changes, mostly to support yaw and roll trim.

[flightgear.git] / src / Main / Makefile.am

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index f43dc25d3282e23fb4f34f235653fe7900c26fad..a6937492eaa27169bcf09983c2c5c56d246aea10 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -19,6 +19,12 @@ NETWORK_LIBS = \
        $(top_builddir)/src/Network/libNetwork.a
 endif
 
+if WITH_THREADS
+THREAD_LIBS = -lsgthreads
+else
+THREAD_LIBS =
+endif
+
 if OLD_AUTOMAKE
 # nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
 else
@@ -29,21 +35,19 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-noinst_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
 
-bin_SCRIPTS = runfgfs
+# bin_SCRIPTS = runfgfs
 
 fgfs_SOURCES = \
        main.cxx \
-       bfi.cxx bfi.hxx \
+       fg_commands.cxx fg_commands.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
        fg_props.cxx fg_props.hxx \
         fgfs.cxx fgfs.hxx \
        globals.cxx globals.hxx \
-       keyboard.cxx keyboard.hxx \
        options.cxx options.hxx \
-       soundmgr.cxx soundmgr.hxx \
        splash.cxx splash.hxx \
        viewer.cxx viewer.hxx \
        viewer_lookat.cxx viewer_lookat.hxx \
@@ -52,28 +56,32 @@ fgfs_SOURCES = \
 
 fgfs_LDADD = \
        $(top_builddir)/src/Aircraft/libAircraft.a \
+       $(top_builddir)/src/ATC/libATC.a \
        $(top_builddir)/src/Autopilot/libAutopilot.a \
        $(top_builddir)/src/Cockpit/libCockpit.a \
        $(top_builddir)/src/Controls/libControls.a \
        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/Balloon/libBalloon.a \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
+       $(top_builddir)/src/FDM/YASim/libYASim.a \
        $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
        $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
        $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
        $(top_builddir)/src/GUI/libGUI.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
        $(top_builddir)/src/Scenery/libScenery.a \
+       $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
         $(NETWORK_LIBS) \
        $(top_builddir)/src/Objects/libObjects.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
-       $(top_builddir)/src/Joystick/libJoystick.a \
-       -lsgroute -lsgsky -lsgephem -lsgmetar -lsgtiming -lsgio -lsgscreen \
+       $(top_builddir)/src/Input/libInput.a \
+       -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
        -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
        $(SERIAL_LIBS) \
-       -lplibpu -lplibfnt -lplibssg -lplibsg \
+       $(THREAD_LIBS) \
+       -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
        -lmk4 -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)