A couple ADF needle direction tweaks.

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index f084156092f7bc3531dc3e6ba320646935f353cf..f21c5cc669b8dfb06822050c24bd9015feac0fc4 100644 (file)
--- 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
@@ -25,7 +25,7 @@ else
 THREAD_LIBS =
 endif
 
-if OLD_AUTOMAKE
+if ANCIENT_AUTOMAKE
 # nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
 else
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
@@ -35,9 +35,9 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-noinst_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
 
-bin_SCRIPTS = runfgfs
+# bin_SCRIPTS = runfgfs
 
 fgfs_SOURCES = \
        main.cxx \
@@ -47,25 +47,29 @@ fgfs_SOURCES = \
        fg_props.cxx fg_props.hxx \
         fgfs.cxx fgfs.hxx \
        globals.cxx globals.hxx \
+        logger.cxx logger.hxx \
        options.cxx options.hxx \
        splash.cxx splash.hxx \
        viewer.cxx viewer.hxx \
-       viewer_lookat.cxx viewer_lookat.hxx \
-       viewer_rph.cxx viewer_rph.hxx \
-       viewmgr.cxx viewmgr.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/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 \
@@ -79,9 +83,17 @@ fgfs_LDADD = \
        -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
        $(SERIAL_LIBS) \
        $(THREAD_LIBS) \
-       -lplibpu -lplibfnt -lplibssg -lplibsg \
+       -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
        -lmk4 -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)
 
+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
+
+