Maik JUSTUS: fix bug in previous commit

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ce31e6ebb9789f6ef74c93671d887becf4e05a27..bdf468654daf3978e1f79da94513c78b8e380fd7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,27 +1,3 @@
-if ENABLE_WEATHERCM
-WEATHER_DIR = WeatherCM
-else
-WEATHER_DIR = Environment
-endif
-
-if HAVE_PLIB_PSL
-SCRIPTING_DIRS = Scripting
-else
-SCRIPTING_DIRS =
-endif
-
-if ENABLE_MPLAYER_AS
-MPLAYER_DIRS = MultiPlayer
-else
-MPLAYER_DIRS =
-endif
-
-if ENABLE_NETWORK_OLK
-NETWORK_DIRS = NetworkOLK
-else
-NETWORK_DIRS =
-endif
-
 SUBDIRS = \
         Include \
         Aircraft \
@@ -29,21 +5,20 @@ SUBDIRS = \
         ATC \
         Autopilot \
         Cockpit \
-        Controls \
+        Environment \
         FDM \
         GUI \
         Input \
        Instrumentation \
         Model \
+       AIModel \
         Navaids \
         Network \
-       $(MPLAYER_DIRS) \
-        $(NETWORK_DIRS) \
-        Objects \
+       MultiPlayer \
         Scenery \
-        $(SCRIPTING_DIRS) \
+       Scripting \
         Sound \
         Systems \
         Time \
-        $(WEATHER_DIR) \
+       Traffic \
         Main