In the process of changing, adding and removing files the last few years

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 1a1a3d7985eb86affff0764bcdd4f1605685c59c..4efa4deaf0f5a5dbde8da79939c3396b4e640459 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,9 +1,18 @@
+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
+else
+SP_FDM_LIBS = 
+endif
+
 if WITH_THREADS
 THREAD_LIBS = -lsgthreads $(thread_LIBS)
 else
@@ -16,16 +25,8 @@ else
 GFX_CODE = fg_os.cxx fg_os.hxx
 endif
 
-if FG_USE_CLOUDS_3D
-CLOUD3D_LIBS = -lsgclouds3d
-else
-CLOUD3D_LIBS = 
-endif
-
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
 
-EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
-
 bin_PROGRAMS = fgfs metar
 
 noinst_SCRIPTS = runfgfs.bat runfgfs
@@ -36,6 +37,7 @@ noinst_LIBRARIES = libMain.a
 
 libMain_a_SOURCES = \
        main.cxx main.hxx \
+       renderer.cxx renderer.hxx \
        fg_commands.cxx fg_commands.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
@@ -57,7 +59,6 @@ fgfs_LDADD = \
        $(top_builddir)/src/ATC/libATC.a \
        $(top_builddir)/src/Cockpit/libCockpit.a \
        $(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
-       $(top_builddir)/src/Controls/libControls.a \
        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/Balloon/libBalloon.a \
        $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
@@ -67,6 +68,7 @@ fgfs_LDADD = \
        $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
        $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
        $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
+       $(SP_FDM_LIBS) \
        $(top_builddir)/src/GUI/libGUI.a \
        $(top_builddir)/src/Autopilot/libAutopilot.a \
        $(top_builddir)/src/Input/libInput.a \
@@ -80,12 +82,10 @@ fgfs_LDADD = \
        $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
        $(MPLAYER_LIBS) \
-       $(top_builddir)/src/Replay/libReplay.a \
        $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(top_builddir)/src/Traffic/libTraffic.a \
        $(top_builddir)/src/Environment/libEnvironment.a \
-       $(CLOUD3D_LIBS) \
        -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
        -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
        -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \