Improve timing statistics

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index f05cc2ca9f0811efad8d621e71fc973cd9304bbf..c4525ed8b29f34a9da3cf92bae450605606d060a 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -6,13 +6,28 @@ MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
 if ENABLE_SP_FDM
 SP_FDM_LIBS = $(top_builddir)/src/FDM/SP/libSPFDM.a
 else
-SP_FDM_LIBS = 
+SP_FDM_LIBS =
 endif
 
-if WITH_THREADS
-THREAD_LIBS = -lsgthreads $(thread_LIBS)
+if WITH_EVENTINPUT
+EVENT_LIBS = $(eventinput_LIBS)
 else
-THREAD_LIBS =
+EVENT_LIBS =
+endif
+
+if HAVE_FRAMEWORK_PLIB
+fgfs_PLIB_FW = $(plib_FRAMEWORK)
+else
+fgfs_PLIB_LIBS = -lplibpuaux -lplibpu -lplibfnt -lplibjs  \
+       -lplibsg -lplibul 
+endif
+
+if HAVE_FRAMEWORK_OSG
+fgfs_OSG_FW = $(osg_FRAMEWORKS) $(openthreads_FRAMEWORK)
+endif
+
+if WITH_HLA
+HLA_LDADD=$(HLA_LDFLAGS) $(top_builddir)/src/Network/HLA/libFGHLA.a $(HLA_LIBS)
 endif
 
 GFX_CODE = fg_os_osgviewer.cxx fg_os_common.cxx fg_os.hxx
@@ -40,6 +55,7 @@ noinst_LIBRARIES = libMain.a
 libMain_a_SOURCES = \
        main.cxx main.hxx \
        renderer.cxx renderer.hxx \
+       fgviewer.cxx fgviewer.hxx \
        fg_commands.cxx fg_commands.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
@@ -53,7 +69,6 @@ libMain_a_SOURCES = \
        viewmgr.cxx viewmgr.hxx \
        CameraGroup.cxx CameraGroup.hxx \
        FGEventHandler.cxx FGEventHandler.hxx \
-       ViewPartitionNode.cxx ViewPartitionNode.hxx \
        WindowSystemAdapter.hxx WindowSystemAdapter.cxx \
        WindowBuilder.hxx WindowBuilder.cxx \
        $(GFX_CODE)
@@ -66,7 +81,8 @@ fgfs_LDADD = \
        $(top_builddir)/src/ATCDCL/libATCDCL.a \
        $(top_builddir)/src/Cockpit/libCockpit.a \
        $(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
-       $(top_builddir)/src/FDM/libFlight.a \
+       $(top_builddir)/src/Network/libNetwork.a \
+        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
        $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
        $(JSBSIM_LIBS) \
@@ -81,7 +97,6 @@ fgfs_LDADD = \
        $(top_builddir)/src/Instrumentation/libInstrumentation.a \
        $(top_builddir)/src/Instrumentation/HUD/libHUD.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 \
@@ -94,24 +109,28 @@ fgfs_LDADD = \
        $(top_builddir)/src/Time/libTime.a \
        $(top_builddir)/src/Traffic/libTraffic.a \
        $(top_builddir)/src/Environment/libEnvironment.a \
-       -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
-       -lsgutil -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops \
-       -lsgdebug -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
-       -lsgstructure -lsgenvironment \
-       -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
-       -lplibsg -lplibul \
+       $(HLA_LDADD) \
+       -lsgroute -lsgsky -lsgsound -lsgephem -lsgtgdb -lsgmodel -lsgbvh \
+       -lsgmaterial -lsgutil -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket \
+       -lsgprops -lsgdebug -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound \
+       -lsgserial -lsgstructure -lsgenvironment \
+        $(fgfs_PLIB_LIBS) \
        $(OSG_LIBS) \
-       $(THREAD_LIBS) \
+       $(thread_LIBS) \
        $(network_LIBS) \
        -lz \
        $(opengl_LIBS) \
-       $(openal_LIBS)
+       $(openal_LIBS) \
+       $(EVENT_LIBS)
+
+fgfs_LDFLAGS = $(fgfs_PLIB_FW) $(fgfs_OSG_FW) $(LDFLAGS)
 
 metar_SOURCES = metar_main.cxx
 
 metar_LDADD = \
         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
-        -lplibnet -lplibul $(network_LIBS) \
+        $(network_LIBS) \
         -lz $(base_LIBS)
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_builddir)/src $(HLA_CPPFLAGS)