Merge branch 'next' into durk-atc

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 74a44e7f9c19e75d341a9132cc0893cbdf03af02..178419eb064efa6da3bc520000cf51b19c288cd3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,12 @@
-if ENABLE_WEATHERCM
-WEATHER_DIR = WeatherCM
-else
-WEATHER_DIR = Environment
-endif
-
-if ENABLE_MPLAYER_AS
-MPLAYER_DIRS = MultiPlayer
-else
-MPLAYER_DIRS =
-endif
-
 SUBDIRS = \
         Include \
         Aircraft \
         Airports \
-        ATC \
+       ATC \
+        ATCDCL \
         Autopilot \
         Cockpit \
-        Controls \
+        Environment \
         FDM \
         GUI \
         Input \
@@ -26,13 +15,11 @@ SUBDIRS = \
        AIModel \
         Navaids \
         Network \
-       $(MPLAYER_DIRS) \
-        Objects \
-       Replay \
+       MultiPlayer \
         Scenery \
        Scripting \
         Sound \
         Systems \
         Time \
-        $(WEATHER_DIR) \
+       Traffic \
         Main