Merge branch 'jmt/acinclude'

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 32244c9feaa93a6e9be706573fd67c5b7ac26030..e0798d6d421c692834f9cec2e4d710e7366b5556 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -9,10 +9,30 @@ 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 = $(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
@@ -40,6 +60,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 +74,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)
@@ -63,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 \
@@ -98,20 +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)
+       $(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