Remove the reference to libObject.a since it isn't generated anymore.

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index ccaa40f8697763a91265dca4da9ebaa61a81a1d7..c55d494183e58bf9ab3c7101453c69b4e531b519 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -10,25 +10,16 @@ else
 MPLAYER_LIBS = 
 endif
 
-if ENABLE_NETWORK_OLK
-NETWORK_LIBS = $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
-else
-NETWORK_LIBS =
-endif
-
-
 if WITH_THREADS
 THREAD_LIBS = -lsgthreads $(thread_LIBS)
 else
 THREAD_LIBS =
 endif
 
-if HAVE_PLIB_PSL
-SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
-PSL_LIBS = -lplibpsl
+if FG_USE_CLOUDS_3D
+CLOUD3D_LIBS = -lsgclouds3d
 else
-SCRIPTING_LIBS =
-PSL_LIBS =
+CLOUD3D_LIBS = 
 endif
 
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
@@ -39,15 +30,16 @@ bin_PROGRAMS = fgfs
 
 noinst_SCRIPTS = runfgfs.bat runfgfs
 
+noinst_LIBRARIES = libMain.a
+
 # bin_SCRIPTS = runfgfs
 
-fgfs_SOURCES = \
-       main.cxx \
+libMain_a_SOURCES = \
+       main.cxx main.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 \
         logger.cxx logger.hxx \
        options.cxx options.hxx \
@@ -56,7 +48,10 @@ fgfs_SOURCES = \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx
 
+fgfs_SOURCES = bootstrap.cxx
+
 fgfs_LDADD = \
+       $(top_builddir)/src/Main/libMain.a \
        $(top_builddir)/src/Aircraft/libAircraft.a \
        $(top_builddir)/src/ATC/libATC.a \
        $(top_builddir)/src/Autopilot/libAutopilot.a \
@@ -76,26 +71,27 @@ fgfs_LDADD = \
        $(top_builddir)/src/Input/libInput.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 \
-        $(SCRIPTING_LIBS) \
+       $(top_builddir)/src/Scripting/libScripting.a \
        $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
        $(MPLAYER_LIBS) \
-        $(NETWORK_LIBS) \
-       $(top_builddir)/src/Objects/libObjects.a \
+       $(top_builddir)/src/Replay/libReplay.a \
        $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
+       $(CLOUD3D_LIBS) \
        -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
        -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
-       -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial \
+       -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
+       -lsgstructure \
        $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \
-        $(PSL_LIBS) \
-       -lmk4 -lz \
+       -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)