Lots of changes to the ATC/AI system for initial revision of random AI GA VFR traffic

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index dc48e7995ce689b29f7554a2d3fd20be474e96d5..c55d494183e58bf9ab3c7101453c69b4e531b519 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,74 +1,98 @@
-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_OLD_WEATHER
-WEATHER_LIBS = $(top_builddir)/src/Weather/libWeather.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
+if WITH_THREADS
+THREAD_LIBS = -lsgthreads $(thread_LIBS)
 else
-NETWORK_LIBS = \
-       $(top_builddir)/src/Network/libNetwork.a
+THREAD_LIBS =
 endif
 
-if OLD_AUTOMAKE
-CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+if FG_USE_CLOUDS_3D
+CLOUD3D_LIBS = -lsgclouds3d
 else
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+CLOUD3D_LIBS = 
 endif
 
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-bin_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
+
+noinst_LIBRARIES = libMain.a
 
-fgfs_SOURCES = \
-       bfi.cxx bfi.hxx \
+# bin_SCRIPTS = runfgfs
+
+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 \
-       keyboard.cxx keyboard.hxx \
-       main.cxx \
+       fg_props.cxx fg_props.hxx \
+       globals.cxx globals.hxx \
+        logger.cxx logger.hxx \
        options.cxx options.hxx \
-       save.cxx save.hxx \
        splash.cxx splash.hxx \
-       views.cxx views.hxx
+       util.cxx util.hxx \
+       viewer.cxx viewer.hxx \
+       viewmgr.cxx viewmgr.hxx
 
-#      fg_serial.cxx fg_serial.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 \
        $(top_builddir)/src/Cockpit/libCockpit.a \
+       $(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
        $(top_builddir)/src/Controls/libControls.a \
-       $(top_builddir)/src/Ephemeris/libEphemeris.a \
        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/Balloon/libBalloon.a \
-       $(top_builddir)/src/FDM/JSBsim/libJSBsim.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/AIModel/libAIModel.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 \
+       $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
-        $(NETWORK_LIBS) \
-       $(top_builddir)/src/Objects/libObjects.a \
-       $(top_builddir)/src/Clouds/libClouds.a \
+       $(MPLAYER_LIBS) \
+       $(top_builddir)/src/Replay/libReplay.a \
+       $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
-       $(top_builddir)/src/Sky/libSky.a \
-       $(top_builddir)/src/Joystick/libJoystick.a \
-       $(SERIAL_LIBS) \
-       -lsgscreen -lsgmath -lsgbucket -lsgdebug -lsgmisc \
-       -lplibpu -lplibfnt -lplibssg -lplibsg \
+       $(CLOUD3D_LIBS) \
+       -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
+       -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
+       -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
+       -lsgstructure \
+       $(THREAD_LIBS) \
+       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
+       $(network_LIBS) \
        -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src