X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=a6937492eaa27169bcf09983c2c5c56d246aea10;hb=a4ba46a270959bc866387873f29c1d980979fff7;hp=ac7427c7d4167a0b6123d289073637d8b5365b1d;hpb=8f3aa1bebd7c60b1ad328d10beae841daab4e292;p=flightgear.git

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index ac7427c7d..a6937492e 100644
--- 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,47 +35,55 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-bin_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
+
+# bin_SCRIPTS = runfgfs
 
 fgfs_SOURCES = \
-	bfi.cxx bfi.hxx \
+	main.cxx \
+	fg_commands.cxx fg_commands.hxx \
 	fg_init.cxx fg_init.hxx \
 	fg_io.cxx fg_io.hxx \
-	keyboard.cxx keyboard.hxx \
-	main.cxx \
+	fg_props.cxx fg_props.hxx \
+        fgfs.cxx fgfs.hxx \
+	globals.cxx globals.hxx \
 	options.cxx options.hxx \
-	save.cxx save.hxx \
 	splash.cxx splash.hxx \
-	views.cxx views.hxx
-
-#	fg_serial.cxx fg_serial.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 \
+	$(top_builddir)/src/ATC/libATC.a \
 	$(top_builddir)/src/Autopilot/libAutopilot.a \
 	$(top_builddir)/src/Cockpit/libCockpit.a \
 	$(top_builddir)/src/Controls/libControls.a \
-	$(top_builddir)/src/Ephemeris/libEphemeris.a \
 	$(top_builddir)/src/FDM/libFlight.a \
 	$(top_builddir)/src/FDM/Balloon/libBalloon.a \
-	$(top_builddir)/src/FDM/JSBsim/libJSBsim.a \
+	$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
+	$(top_builddir)/src/FDM/YASim/libYASim.a \
+	$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
 	$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
 	$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
 	$(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/Clouds/libClouds.a \
 	$(top_builddir)/src/Time/libTime.a \
 	$(WEATHER_LIBS) \
-	$(top_builddir)/src/Sky/libSky.a \
-	$(top_builddir)/src/Joystick/libJoystick.a \
+	$(top_builddir)/src/Input/libInput.a \
+	-lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
+	-lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
 	$(SERIAL_LIBS) \
-	-lsgscreen -lsgmath -lsgbucket -lsgdebug -lsgmisc \
-	-lplibpu -lplibfnt -lplibssg -lplibsg \
-	-lz \
+	$(THREAD_LIBS) \
+	-lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
+	-lmk4 -lz \
 	$(opengl_LIBS) \
 	$(audio_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src