Mathias Froehlich:

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 7f0cf1cb8da9956253b9fb3baec47830d637bb84..7c116233cbd21ace41b2aa6de9a3a0e35d4c4a96 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,88 +1,124 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_LIBS = -lsgserial
-else
-SERIAL_LIBS =
-endif
+EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
+             fg_os_sdl.cxx fg_os.cxx fg_os.hxx
 
-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 ENABLE_SP_FDM
+SP_FDM_LIBS = $(top_builddir)/src/FDM/SP/libSPFDM.a
 else
-NETWORK_LIBS = \
-       $(top_builddir)/src/Network/libNetwork.a
+SP_FDM_LIBS = 
 endif
 
 if WITH_THREADS
-THREAD_LIBS = -lsgthreads
+THREAD_LIBS = -lsgthreads $(thread_LIBS)
 else
 THREAD_LIBS =
 endif
 
-if OLD_AUTOMAKE
-# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+if USE_FESTIVAL
+VOICE_LIBS = $(top_builddir)/src/Voice/libVoice.a
 else
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+VOICE_LIBS =
 endif
 
-EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
+if USE_SDL
+GFX_CODE = fg_os_sdl.cxx fg_os.hxx
+else
+GFX_CODE = fg_os.cxx fg_os.hxx
+endif
 
-bin_PROGRAMS = fgfs
+JSBSIM_LIBS = \
+       $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
+        $(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \
+        $(top_builddir)/src/FDM/JSBSim/models/libModels.a \
+        $(top_builddir)/src/FDM/JSBSim/models/flight_control/libFlightControl.a\
+        $(top_builddir)/src/FDM/JSBSim/models/atmosphere/libAtmosphere.a \
+        $(top_builddir)/src/FDM/JSBSim/models/propulsion/libPropulsion.a \
+        $(top_builddir)/src/FDM/JSBSim/input_output/libInputOutput.a \
+        $(top_builddir)/src/FDM/JSBSim/math/libMath.a
+
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
+
+bin_PROGRAMS = fgfs metar
 
 noinst_SCRIPTS = runfgfs.bat runfgfs
 
+noinst_LIBRARIES = libMain.a
+
 # bin_SCRIPTS = runfgfs
 
-fgfs_SOURCES = \
-       main.cxx \
+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 \
        fg_props.cxx fg_props.hxx \
-        fgfs.cxx fgfs.hxx \
        globals.cxx globals.hxx \
+        logger.cxx logger.hxx \
        options.cxx options.hxx \
        splash.cxx splash.hxx \
+       util.cxx util.hxx \
        viewer.cxx viewer.hxx \
-       viewer_lookat.cxx viewer_lookat.hxx \
-       viewer_rph.cxx viewer_rph.hxx \
-       viewmgr.cxx viewmgr.hxx
+       viewmgr.cxx viewmgr.hxx \
+       $(GFX_CODE)
+
+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/Controls/libControls.a \
+       $(top_builddir)/src/Cockpit/built_in/libBuilt_in.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/JSBSim/filtersjb/libfiltersjb.a \
+       $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
+       $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
+       $(JSBSIM_LIBS) \
+       $(top_builddir)/src/FDM/YASim/libYASim.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/KLN89/libKLN89.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 \
        $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
-        $(NETWORK_LIBS) \
-       $(top_builddir)/src/Objects/libObjects.a \
+       $(MPLAYER_LIBS) \
+        $(top_builddir)/src/AIModel/libAIModel.a \
+       $(VOICE_LIBS) \
+       $(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) \
+       $(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 -lsgnasal -lsgxml -lsgsound -lsgserial \
+       -lsgstructure -lsgenvironment \
        $(THREAD_LIBS) \
-       -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
-       -lmk4 -lz \
+       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssgaux -lplibssg -lplibsg -lplibul \
+       $(network_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
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim