- adjusted for no-value constructor for FGPanel

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 37bce676aa5300f004b4b7c1e7ebc29dd9711ec4..d07f1e867437b805901255f1e018928541e6ebc7 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -19,8 +19,14 @@ NETWORK_LIBS = \
        $(top_builddir)/src/Network/libNetwork.a
 endif
 
+if WITH_THREADS
+THREAD_LIBS = -lsgthreads
+else
+THREAD_LIBS =
+endif
+
 if OLD_AUTOMAKE
-CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
 else
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
 endif
@@ -29,21 +35,24 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-noinst_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat
 
 bin_SCRIPTS = runfgfs
 
 fgfs_SOURCES = \
        main.cxx \
-       bfi.cxx bfi.hxx \
+       fg_commands.cxx fg_commands.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
+       fg_props.cxx fg_props.hxx \
+        fgfs.cxx fgfs.hxx \
        globals.cxx globals.hxx \
-       keyboard.cxx keyboard.hxx \
        options.cxx options.hxx \
-       save.cxx save.hxx \
        splash.cxx splash.hxx \
-       views.cxx views.hxx
+       viewer.cxx viewer.hxx \
+       viewer_lookat.cxx viewer_lookat.hxx \
+       viewer_rph.cxx viewer_rph.hxx \
+       viewmgr.cxx viewmgr.hxx
 
 fgfs_LDADD = \
        $(top_builddir)/src/Aircraft/libAircraft.a \
@@ -59,15 +68,17 @@ fgfs_LDADD = \
        $(top_builddir)/src/GUI/libGUI.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
        $(top_builddir)/src/Scenery/libScenery.a \
+       $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
         $(NETWORK_LIBS) \
        $(top_builddir)/src/Objects/libObjects.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
-       $(top_builddir)/src/Joystick/libJoystick.a \
-       -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket \
-       -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
+       $(top_builddir)/src/Input/libInput.a \
+       -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
+       -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
        $(SERIAL_LIBS) \
+       $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibssg -lplibsg \
        -lmk4 -lz \
        $(opengl_LIBS) \