X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=bf8c092ad1861d2e076eece0e8af0c6ca6496bbf;hb=1c3e2d4942fe74dac43f1f6af542f9de7d4825db;hp=a5492ddb015ac28fd6084c87aa8c49339ead3f03;hpb=980012e1682fdb27c9b9ec27edea0b549d603f9d;p=flightgear.git

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index a5492ddb0..bf8c092ad 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,8 +1,5 @@
-if ENABLE_WEATHERCM
-WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
-else
-WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
-endif
+EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
+             fg_os_sdl.cxx fg_os.cxx fg_os.hxx
 
 if ENABLE_MPLAYER_AS
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
@@ -10,10 +7,10 @@ else
 MPLAYER_LIBS = 
 endif
 
-if ENABLE_NETWORK_OLK
-NETWORK_LIBS = $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
+if ENABLE_SP_FDM
+SP_FDM_LIBS = $(top_builddir)/src/FDM/SP/libSPFDM.a
 else
-NETWORK_LIBS =
+SP_FDM_LIBS = 
 endif
 
 if WITH_THREADS
@@ -22,25 +19,15 @@ else
 THREAD_LIBS =
 endif
 
-if FG_USE_CLOUDS_3D
-CLOUD3D_LIBS = -lsgclouds3d
-else
-CLOUD3D_LIBS = 
-endif
-
-if HAVE_PLIB_PSL
-SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
-PSL_LIBS = -lplibpsl
+if USE_SDL
+GFX_CODE = fg_os_sdl.cxx fg_os.hxx
 else
-SCRIPTING_LIBS =
-PSL_LIBS =
+GFX_CODE = fg_os.cxx fg_os.hxx
 endif
 
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
 
-EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
-
-bin_PROGRAMS = fgfs
+bin_PROGRAMS = fgfs metar
 
 noinst_SCRIPTS = runfgfs.bat runfgfs
 
@@ -50,6 +37,7 @@ noinst_LIBRARIES = libMain.a
 
 libMain_a_SOURCES = \
 	main.cxx main.hxx \
+	renderer.cxx renderer.hxx \
 	fg_commands.cxx fg_commands.hxx \
 	fg_init.cxx fg_init.hxx \
 	fg_io.cxx fg_io.hxx \
@@ -60,7 +48,8 @@ libMain_a_SOURCES = \
 	splash.cxx splash.hxx \
 	util.cxx util.hxx \
 	viewer.cxx viewer.hxx \
-	viewmgr.cxx viewmgr.hxx
+	viewmgr.cxx viewmgr.hxx \
+	$(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx
 
@@ -68,7 +57,6 @@ 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 \
@@ -81,33 +69,41 @@ fgfs_LDADD = \
 	$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
 	$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
 	$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
+	$(SP_FDM_LIBS) \
 	$(top_builddir)/src/GUI/libGUI.a \
+	$(top_builddir)/src/Autopilot/libAutopilot.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 \
-        $(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) \
+	$(top_builddir)/src/Traffic/libTraffic.a \
+	$(top_builddir)/src/Environment/libEnvironment.a \
 	-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 -lsgenvironment \
 	$(THREAD_LIBS) \
 	-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
 	$(network_LIBS) \
-        $(PSL_LIBS) \
 	-lz \
 	$(opengl_LIBS) \
-	$(audio_LIBS)
+	$(openal_LIBS)
+
+metar_SOURCES = metar_main.cxx
+
+metar_LDADD = \
+        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
+        -lplibnet -lplibul $(network_LIBS) \
+        -lz $(base_LIBS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src