Go back to the simpler arrangement syntax of a map of vectors.

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 776ff82883e2430a39b44b7ea7f87477df01571b..e820a20c0d7c7459018cd5cef52b4b34667b081d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
-if ENABLE_OLD_WEATHER
-WEATHER_DIR = Weather
-else
+if ENABLE_WEATHERCM
 WEATHER_DIR = WeatherCM
+else
+WEATHER_DIR = Environment
 endif
 
 if ENABLE_NETWORK_OLK
@@ -10,22 +10,32 @@ else
 NETWORK_DIRS = Network
 endif
 
+if HAVE_PLIB_PSL
+SCRIPTING_DIRS = Scripting
+else
+SCRIPTING_DIRS =
+endif
+
 SUBDIRS = \
-       Include \
+        Include \
         Aircraft \
         Airports \
+        ATC \
         Autopilot \
         Cockpit \
         Controls \
         FDM \
         GUI \
-       Input \
-        Joystick \
-       Navaids \
+        Input \
+       Instrumentation \
+        Model \
+        Navaids \
         $(NETWORK_DIRS) \
         Objects \
         Scenery \
-       Sound \
+        $(SCRIPTING_DIRS) \
+        Sound \
+        Systems \
         Time \
         $(WEATHER_DIR) \
         Main