X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=f21c5cc669b8dfb06822050c24bd9015feac0fc4;hb=f6e80608797fa9ab9d44444eb7b031e412b83067;hp=705c7aba46f7e2a8df229a54e258fdbef6659faf;hpb=f9b28c103d528de232e74c9fbf2f38a71a6bd77c;p=flightgear.git

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 705c7aba4..f21c5cc66 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -4,10 +4,10 @@ else
 SERIAL_LIBS =
 endif
 
-if ENABLE_OLD_WEATHER
-WEATHER_LIBS = $(top_builddir)/src/Weather/libWeather.a
-else
+if ENABLE_WEATHERCM
 WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
+else
+WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
 endif
 
 if ENABLE_NETWORK_OLK
@@ -19,8 +19,14 @@ NETWORK_LIBS = \
 	$(top_builddir)/src/Network/libNetwork.a
 endif
 
-if OLD_AUTOMAKE
-CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+if WITH_THREADS
+THREAD_LIBS = -lsgthreads
+else
+THREAD_LIBS =
+endif
+
+if ANCIENT_AUTOMAKE
+# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
 else
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
 endif
@@ -29,48 +35,65 @@ 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 = \
 	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 \
+        logger.cxx logger.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 \
+	viewmgr.cxx viewmgr.hxx \
+        location.cxx location.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/Cockpit/built_in/libBuilt_in.a \
 	$(top_builddir)/src/Controls/libControls.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/filtersjb/libfiltersjb.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/Model/libModel.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 \
+	$(top_builddir)/src/Input/libInput.a \
+	-lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
+	-lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
 	$(SERIAL_LIBS) \
-	-lsgsky -lsgephem -lsgtiming -lsgscreen -lsgmath -lsgbucket \
-	-lsgdebug -lsgmagvar -lsgmisc \
-	-lplibpu -lplibfnt -lplibssg -lplibsg \
+	$(THREAD_LIBS) \
+	-lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
 	-lmk4 -lz \
 	$(opengl_LIBS) \
 	$(audio_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+fgfs_CFLAGS = -DTHIS_IS_A_TEST
+
+if OLD_AUTOMAKE
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif
+
+