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 7230ff957c692dfba864de94a2ca60d0228ab1b6..c55d494183e58bf9ab3c7101453c69b4e531b519 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -22,14 +22,6 @@ else
 CLOUD3D_LIBS = 
 endif
 
-if HAVE_PLIB_PSL
-SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
-PSL_LIBS = -lplibpsl
-else
-SCRIPTING_LIBS =
-PSL_LIBS =
-endif
-
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
 
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
@@ -79,14 +71,14 @@ 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) \
-       $(top_builddir)/src/Objects/libObjects.a \
        $(top_builddir)/src/Replay/libReplay.a \
        $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
@@ -94,11 +86,11 @@ fgfs_LDADD = \
        $(CLOUD3D_LIBS) \
        -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
        -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
-       -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial -lsgstructure \
+       -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
+       -lsgstructure \
        $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \
-        $(PSL_LIBS) \
        -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)