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 1e216706f4f8274fc177ba23e1982bda754fc5ed..272ff139602e7dbc4cac3ce9af10547ecc871318 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,36 +1,38 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_LIBS = -lsgserial
+if ENABLE_WEATHERCM
+WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
 else
-SERIAL_LIBS =
+WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
 endif
 
-if ENABLE_NEW_ENVIRONMENT
-WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
+if ENABLE_MPLAYER_AS
+MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
 else
-WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
+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
 THREAD_LIBS =
 endif
 
-if ANCIENT_AUTOMAKE
-# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+if HAVE_PLIB_PSL
+SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
+PSL_LIBS = -lplibpsl
 else
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+SCRIPTING_LIBS =
+PSL_LIBS =
 endif
 
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
@@ -50,6 +52,7 @@ fgfs_SOURCES = \
         logger.cxx logger.hxx \
        options.cxx options.hxx \
        splash.cxx splash.hxx \
+       util.cxx util.hxx \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx
 
@@ -62,36 +65,37 @@ fgfs_LDADD = \
        $(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 \
+       $(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 \
        $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
        $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
        $(top_builddir)/src/GUI/libGUI.a \
+       $(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 \
+        $(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) \
-       $(top_builddir)/src/Input/libInput.a \
-       -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
-       -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
-       $(SERIAL_LIBS) \
+       -lsgroute -lsgsky -lsgephem -lsgmaterial -lsgtgdb -lsgmodel -lsgtiming \
+       -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug -lsgmagvar \
+       -lsgmisc -lsgxml -lsgsound -lsgserial \
        $(THREAD_LIBS) \
-       -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
+       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
+        $(PSL_LIBS) \
        -lmk4 -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)
 
-fgfs_CFLAGS = -DTHIS_IS_A_TEST
-
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif
-