Modifications to incorporate Jon S. Berndts flight model code.

[flightgear.git] / Main / Makefile.am

diff --git a/Main/Makefile.am b/Main/Makefile.am
index 4ffd1a28233ad1949ef0baf53da4ca27db0e0cc1..fdf2aa9e797e8af3e98dcf6cdbf3ac2d1a83ca58 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -13,10 +13,22 @@ if ENABLE_WIN32_AUDIO
 LIBS += -lwinmm
 endif
 
+if ENABLE_LINUX_JOYSTICK
+DEFS += -DENABLE_LINUX_JOYSTICK
+else
+DEFS += -DENABLE_GLUT_JOYSTICK
+endif
+
 if ENABLE_XMESA_FX
 DEFS += -DXMESA -DFX
 endif
 
+if ENABLE_UNIX_SERIAL
+SERIAL_LIBS = $(top_builddir)/Lib/Serial/libSerial.a
+else
+SERIAL_LIBS =
+endif
+
 EXTRA_DIST = runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
@@ -27,33 +39,37 @@ fgfs_SOURCES = \
        GLUTkey.cxx GLUTkey.hxx GLUTmain.cxx \
        fg_config.h \
        fg_init.cxx fg_init.hxx \
+       fg_serial.cxx fg_serial.hxx \
        options.cxx options.hxx \
        splash.cxx splash.hxx \
        views.cxx views.hxx
 
 fgfs_LDADD = \
        $(top_builddir)/Simulator/Aircraft/libAircraft.a \
-       $(top_builddir)/Simulator/Airports/libAirports.a \
        $(top_builddir)/Simulator/Astro/libAstro.a \
        $(top_builddir)/Simulator/Autopilot/libAutopilot.a \
        $(top_builddir)/Simulator/Cockpit/libCockpit.a \
        $(top_builddir)/Simulator/Controls/libControls.a \
-       $(top_builddir)/Simulator/Flight/libFlight.a \
-       $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \
-       $(top_builddir)/Simulator/Flight/Slew/libSlew.a \
+       $(top_builddir)/Simulator/FDM/libFlight.a \
+       $(top_builddir)/Simulator/FDM/External/libExternal.a \
+       $(top_builddir)/Simulator/FDM/JSBsim/libJSBsim.a \
+       $(top_builddir)/Simulator/FDM/LaRCsim/libLaRCsim.a \
+       $(top_builddir)/Simulator/FDM/Slew/libSlew.a \
        $(top_builddir)/Simulator/GUI/libGUI.a \
        $(top_builddir)/Simulator/Scenery/libScenery.a \
+       $(top_builddir)/Simulator/Airports/libAirports.a \
        $(top_builddir)/Simulator/Objects/libObjects.a \
        $(top_builddir)/Simulator/Time/libTime.a \
        $(top_builddir)/Simulator/Weather/libWeather.a \
-        $(top_builddir)/Simulator/Joystick/libJoystick.a \
-       $(AUDIO_LIBS) \
+       $(top_builddir)/Simulator/Joystick/libJoystick.a \
+       $(AUDIO_LIBS) $(SERIAL_LIBS) \
        $(top_builddir)/Lib/Math/libMath.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
        $(top_builddir)/Lib/PUI/libPUI.a \
        $(top_builddir)/Lib/zlib/libz.a \
-       $(top_builddir)/Lib/Misc/libMisc.a
+       $(top_builddir)/Lib/Misc/libMisc.a \
+       $(opengl_LIBS)
 
 INCLUDES += \
        -I$(top_builddir) \