Improve timing statistics

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 0994d859ad1c585049c147cb8f712a262dd1bec7..c4525ed8b29f34a9da3cf92bae450605606d060a 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -6,13 +6,7 @@ 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 = 
-endif
-
-if WITH_THREADS
-THREAD_LIBS = -lsgthreads $(thread_LIBS)
-else
-THREAD_LIBS =
+SP_FDM_LIBS =
 endif
 
 if WITH_EVENTINPUT
@@ -23,17 +17,19 @@ endif
 
 if HAVE_FRAMEWORK_PLIB
 fgfs_PLIB_FW = $(plib_FRAMEWORK)
-metar_PLIB_FW = $(plib_FRAMEWORK)
 else
-fgfs_PLIB_LIBS = -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
+fgfs_PLIB_LIBS = -lplibpuaux -lplibpu -lplibfnt -lplibjs  \
        -lplibsg -lplibul 
-metar_PLIB_LIBS = -lplibnet -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
 
 JSBSIM_LIBS = \
@@ -85,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) \
@@ -100,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 \
@@ -113,28 +109,28 @@ fgfs_LDADD = \
        $(top_builddir)/src/Time/libTime.a \
        $(top_builddir)/src/Traffic/libTraffic.a \
        $(top_builddir)/src/Environment/libEnvironment.a \
+       $(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) \
        $(EVENT_LIBS)
 
-fgfs_LDFLAGS = $(fgfs_PLIB_FW) $(fgfs_OSG_FW)
+fgfs_LDFLAGS = $(fgfs_PLIB_FW) $(fgfs_OSG_FW) $(LDFLAGS)
 
 metar_SOURCES = metar_main.cxx
 
 metar_LDADD = \
         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
-        $(metar_PLIB_LIBS) $(network_LIBS) \
+        $(network_LIBS) \
         -lz $(base_LIBS)
 
-metar_LDFLAGS = $(metar_PLIB_FW)
 
-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)