Make sure 'make dist' keeps working.

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 37838c9bc03124481795cadebd9d7202ac459069..343d2fb752c5f99fdb8c74a8b6a4ad25cacec0e8 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -15,13 +15,14 @@ else
 THREAD_LIBS =
 endif
 
+GFX_COMMON = fg_os_common.cxx fg_os.hxx
 if USE_SDL
-GFX_CODE = fg_os_sdl.cxx fg_os.hxx
+GFX_CODE = fg_os_sdl.cxx $(GFX_COMMON)
 else
-if USE_OSGVIEWER
-GFX_CODE = fg_os_osgviewer.cxx fg_os.hxx
+if USE_GLUT
+GFX_CODE = fg_os.cxx $(GFX_COMMON)
 else
-GFX_CODE = fg_os.cxx fg_os.hxx
+GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON)
 endif
 endif
 
@@ -60,6 +61,8 @@ libMain_a_SOURCES = \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx \
        FGManipulator.cxx FGManipulator.hxx \
+       ViewPartitionNode.cxx ViewPartitionNode.hxx \
+       WindowSystemAdapter.hxx WindowSystemAdapter.cxx \
        $(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx
@@ -67,11 +70,10 @@ fgfs_SOURCES = bootstrap.cxx
 fgfs_LDADD = \
        $(top_builddir)/src/Main/libMain.a \
        $(top_builddir)/src/Aircraft/libAircraft.a \
-       $(top_builddir)/src/ATC/libATC.a \
+       $(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/FDM/Balloon/libBalloon.a \
        $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
        $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
        $(JSBSIM_LIBS) \
@@ -94,6 +96,7 @@ fgfs_LDADD = \
        $(top_builddir)/src/Airports/libAirports.a \
        $(MPLAYER_LIBS) \
         $(top_builddir)/src/AIModel/libAIModel.a \
+       $(top_builddir)/src/ATC/libATC.a \
        $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(top_builddir)/src/Traffic/libTraffic.a \
@@ -104,7 +107,7 @@ fgfs_LDADD = \
        -lsgstructure -lsgenvironment \
        -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
        -lplibsg -lplibul \
-       -losgViewer -losgGA -losgText -losgFX -losgUtil -losgDB -losgSim -losg -lOpenThreads \
+       $(OSG_LIBS) \
        $(THREAD_LIBS) \
        $(network_LIBS) \
        -lz \