Changes to support GLUT joystick routines as fall back.

[flightgear.git] / Main / Makefile.am

diff --git a/Main/Makefile.am b/Main/Makefile.am
index c3d91ab59bd73bef59ef298fed096c9c5ec94a66..5dd3c634a64b359f01e07123b3ab80b8d0d90026 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -13,11 +13,10 @@ if ENABLE_WIN32_AUDIO
 LIBS += -lwinmm
 endif
 
-if ENABLE_JOYSTICK_SUPPORT
-DEFS += -DENABLE_JOYSTICK_SUPPORT
-JOYSTICK_LIBS = $(top_builddir)/Simulator/Joystick/libJoystick.a
+if ENABLE_LINUX_JOYSTICK
+DEFS += -DENABLE_LINUX_JOYSTICK
 else
-JOYSTICK_LIBS = 
+DEFS += -DENABLE_GLUT_JOYSTICK
 endif
 
 if ENABLE_XMESA_FX
@@ -53,7 +52,8 @@ fgfs_LDADD = \
        $(top_builddir)/Simulator/Objects/libObjects.a \
        $(top_builddir)/Simulator/Time/libTime.a \
        $(top_builddir)/Simulator/Weather/libWeather.a \
-       $(JOYSTICK_LIBS) $(AUDIO_LIBS) \
+       $(top_builddir)/Simulator/Joystick/libJoystick.a \
+        $(AUDIO_LIBS) \
        $(top_builddir)/Lib/Math/libMath.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Debug/libDebug.a \