Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 968253b825fa6f25c5059c3c0c481b7a5a18d704..272ff139602e7dbc4cac3ce9af10547ecc871318 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -4,15 +4,19 @@ else
 WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
 endif
 
+if ENABLE_MPLAYER_AS
+MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
+else
+MPLAYER_LIBS = 
+endif
+
 if ENABLE_NETWORK_OLK
-NETWORK_LIBS = \
-       $(top_builddir)/src/Network/libNetwork.a \
-       $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
+NETWORK_LIBS = $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
 else
-NETWORK_LIBS = \
-       $(top_builddir)/src/Network/libNetwork.a
+NETWORK_LIBS =
 endif
 
+
 if WITH_THREADS
 THREAD_LIBS = -lsgthreads
 else
@@ -20,8 +24,10 @@ THREAD_LIBS =
 endif
 
 if HAVE_PLIB_PSL
+SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
 PSL_LIBS = -lplibpsl
 else
+SCRIPTING_LIBS =
 PSL_LIBS =
 endif
 
@@ -48,8 +54,7 @@ fgfs_SOURCES = \
        splash.cxx splash.hxx \
        util.cxx util.hxx \
        viewer.cxx viewer.hxx \
-       viewmgr.cxx viewmgr.hxx \
-        location.cxx location.hxx
+       viewmgr.cxx viewmgr.hxx
 
 fgfs_LDADD = \
        $(top_builddir)/src/Aircraft/libAircraft.a \
@@ -61,6 +66,7 @@ fgfs_LDADD = \
        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/Balloon/libBalloon.a \
        $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
+       $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
        $(top_builddir)/src/FDM/YASim/libYASim.a \
        $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
@@ -70,19 +76,21 @@ fgfs_LDADD = \
        $(top_builddir)/src/Input/libInput.a \
        $(top_builddir)/src/Instrumentation/libInstrumentation.a \
        $(top_builddir)/src/Model/libModel.a \
+       $(top_builddir)/src/Network/libNetwork.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
        $(top_builddir)/src/Scenery/libScenery.a \
-       $(top_builddir)/src/Scripting/libScripting.a \
+        $(SCRIPTING_LIBS) \
        $(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/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
-       -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
-       -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
-       -lsgserial \
+       -lsgroute -lsgsky -lsgephem -lsgmaterial -lsgtgdb -lsgmodel -lsgtiming \
+       -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug -lsgmagvar \
+       -lsgmisc -lsgxml -lsgsound -lsgserial \
        $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
         $(PSL_LIBS) \