X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=c4525ed8b29f34a9da3cf92bae450605606d060a;hb=38226af24ec01e8f0a20d7fd73ef838a69f6ef25;hp=b7d7ed87caa5cbebc241eca399be81e70d1db70d;hpb=0e53e2cbb1e7f511c40121ade43a539d15e0e155;p=flightgear.git diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index b7d7ed87c..c4525ed8b 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -6,16 +6,9 @@ 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 ENABLE_ATCDCL -ATCDCL_LIBS = $(top_builddir)/src/ATCDCL/libATCDCL.a -else -ATCDCL_LIBS = -endif - - if WITH_EVENTINPUT EVENT_LIBS = $(eventinput_LIBS) else @@ -33,6 +26,10 @@ 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 = \ @@ -81,7 +78,7 @@ fgfs_SOURCES = bootstrap.cxx fgfs_LDADD = \ libMain.a \ $(top_builddir)/src/Aircraft/libAircraft.a \ - $(ATCDCL_LIBS) \ + $(top_builddir)/src/ATCDCL/libATCDCL.a \ $(top_builddir)/src/Cockpit/libCockpit.a \ $(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \ $(top_builddir)/src/Network/libNetwork.a \ @@ -112,6 +109,7 @@ 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 \ @@ -125,7 +123,7 @@ fgfs_LDADD = \ $(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 @@ -135,4 +133,4 @@ metar_LDADD = \ -lz $(base_LIBS) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_builddir)/src $(HLA_CPPFLAGS)