Fix line endings

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 21cd4908e8f1fffbfbb8bc94dccc0102a1421edd..a619aa67d0f00ab17933997f873476dd3a93273e 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,11 +1,7 @@
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
              fg_os_sdl.cxx fg_os.cxx fg_os.hxx
 
-if ENABLE_MPLAYER_AS
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
-else
-MPLAYER_LIBS = 
-endif
 
 if ENABLE_SP_FDM
 SP_FDM_LIBS = $(top_builddir)/src/FDM/SP/libSPFDM.a
@@ -19,12 +15,6 @@ else
 THREAD_LIBS =
 endif
 
-if USE_FESTIVAL
-VOICE_LIBS = $(top_builddir)/src/Voice/libVoice.a
-else
-VOICE_LIBS =
-endif
-
 if USE_SDL
 GFX_CODE = fg_os_sdl.cxx fg_os.hxx
 else
@@ -90,7 +80,6 @@ fgfs_LDADD = \
        $(top_builddir)/src/Instrumentation/KLN89/libKLN89.a \
        $(top_builddir)/src/Instrumentation/libInstrumentation.a \
        $(top_builddir)/src/Model/libModel.a \
-       $(top_builddir)/src/AIModel/libAIModel.a \
        $(top_builddir)/src/Network/libNetwork.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
        $(top_builddir)/src/Scenery/libScenery.a \
@@ -98,7 +87,7 @@ fgfs_LDADD = \
        $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
        $(MPLAYER_LIBS) \
-       $(VOICE_LIBS) \
+        $(top_builddir)/src/AIModel/libAIModel.a \
        $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(top_builddir)/src/Traffic/libTraffic.a \
@@ -108,7 +97,7 @@ fgfs_LDADD = \
        -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
        -lsgstructure -lsgenvironment \
        $(THREAD_LIBS) \
-       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
+       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssgaux -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \
        -lz \
        $(opengl_LIBS) \