X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=e0798d6d421c692834f9cec2e4d710e7366b5556;hb=658715f90b19e3d99fed48e01f7f4fc13842b25f;hp=e30701f7ba0f1578d23aafc937de1c44a8ea360d;hpb=a6db6d89ff41a619569e6433409e8bf62ff98499;p=flightgear.git

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index e30701f7b..e0798d6d4 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -9,18 +9,32 @@ else
 SP_FDM_LIBS = 
 endif
 
-if WITH_THREADS
-THREAD_LIBS = -lsgthreads $(thread_LIBS)
+if ENABLE_ATCDCL
+ATCDCL_LIBS = $(top_builddir)/src/ATCDCL/libATCDCL.a
 else
-THREAD_LIBS =
+ATCDCL_LIBS = 
 endif
 
+
 if WITH_EVENTINPUT
-EVENT_LIBS = -ldbus-1 -lhal
+EVENT_LIBS = $(eventinput_LIBS)
 else
 EVENT_LIBS =
 endif
 
+if HAVE_FRAMEWORK_PLIB
+fgfs_PLIB_FW = $(plib_FRAMEWORK)
+metar_PLIB_FW = $(plib_FRAMEWORK)
+else
+fgfs_PLIB_LIBS = -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
+	-lplibsg -lplibul 
+metar_PLIB_LIBS = -lplibnet -lplibul 
+endif
+
+if HAVE_FRAMEWORK_OSG
+fgfs_OSG_FW = $(osg_FRAMEWORKS) $(openthreads_FRAMEWORK)
+endif
+
 GFX_CODE = fg_os_osgviewer.cxx fg_os_common.cxx fg_os.hxx
 
 JSBSIM_LIBS = \
@@ -69,7 +83,7 @@ fgfs_SOURCES = bootstrap.cxx
 fgfs_LDADD = \
 	libMain.a \
 	$(top_builddir)/src/Aircraft/libAircraft.a \
-	$(top_builddir)/src/ATCDCL/libATCDCL.a \
+	$(ATCDCL_LIBS) \
 	$(top_builddir)/src/Cockpit/libCockpit.a \
 	$(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
 	$(top_builddir)/src/FDM/libFlight.a \
@@ -104,21 +118,24 @@ fgfs_LDADD = \
 	-lsgmaterial -lsgutil -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket \
 	-lsgprops -lsgdebug -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound \
 	-lsgserial -lsgstructure -lsgenvironment \
-	-lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
-	-lplibsg -lplibul \
+        $(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)
+
 metar_SOURCES = metar_main.cxx
 
 metar_LDADD = \
         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
-        -lplibnet -lplibul $(network_LIBS) \
+        $(metar_PLIB_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