Merge branch 'jt/runway' into next

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 343d2fb752c5f99fdb8c74a8b6a4ad25cacec0e8..0af345baddde3233b8e5ce1401f3a67947ec5ae2 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
-             fg_os_sdl.cxx fg_os.cxx fg_os_osgviewer.cxx fg_os.hxx
+             fg_os_osgviewer.cxx fg_os.hxx
 
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
 
@@ -15,16 +15,7 @@ else
 THREAD_LIBS =
 endif
 
-GFX_COMMON = fg_os_common.cxx fg_os.hxx
-if USE_SDL
-GFX_CODE = fg_os_sdl.cxx $(GFX_COMMON)
-else
-if USE_GLUT
-GFX_CODE = fg_os.cxx $(GFX_COMMON)
-else
-GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON)
-endif
-endif
+GFX_CODE = fg_os_osgviewer.cxx fg_os_common.cxx fg_os.hxx
 
 JSBSIM_LIBS = \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
@@ -60,9 +51,11 @@ libMain_a_SOURCES = \
        util.cxx util.hxx \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx \
-       FGManipulator.cxx FGManipulator.hxx \
+       CameraGroup.cxx CameraGroup.hxx \
+       FGEventHandler.cxx FGEventHandler.hxx \
        ViewPartitionNode.cxx ViewPartitionNode.hxx \
        WindowSystemAdapter.hxx WindowSystemAdapter.cxx \
+       WindowBuilder.hxx WindowBuilder.cxx \
        $(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx