Fix the nmea and garmin output to a) fake a GSA sentence, b) fix a y2k bug

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 86c9491f019f92e864d3189d447cd773dad834bc..74a44e7f9c19e75d341a9132cc0893cbdf03af02 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,17 @@
-if ENABLE_NEW_ENVIRONMENT
-WEATHER_DIR = Environment
-else
+if ENABLE_WEATHERCM
 WEATHER_DIR = WeatherCM
+else
+WEATHER_DIR = Environment
 endif
 
-if ENABLE_NETWORK_OLK
-NETWORK_DIRS = Network NetworkOLK
+if ENABLE_MPLAYER_AS
+MPLAYER_DIRS = MultiPlayer
 else
-NETWORK_DIRS = Network
+MPLAYER_DIRS =
 endif
 
 SUBDIRS = \
-       Include \
+        Include \
         Aircraft \
         Airports \
         ATC \
@@ -20,13 +20,19 @@ SUBDIRS = \
         Controls \
         FDM \
         GUI \
-       Input \
+        Input \
+       Instrumentation \
         Model \
-       Navaids \
-        $(NETWORK_DIRS) \
+       AIModel \
+        Navaids \
+        Network \
+       $(MPLAYER_DIRS) \
         Objects \
+       Replay \
         Scenery \
-       Sound \
+       Scripting \
+        Sound \
+        Systems \
         Time \
         $(WEATHER_DIR) \
         Main