Moved random ground cover object management code (userdata.[ch]xx) over

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 826f93d0078eec9335e93744fe4e7fc0dafbd9b2..ce31e6ebb9789f6ef74c93671d887becf4e05a27 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,49 @@
-if ENABLE_OLD_WEATHER
-WEATHER_DIR = Weather
-else
+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 = Network NetworkOLK
+NETWORK_DIRS = NetworkOLK
 else
-NETWORK_DIRS = Network
+NETWORK_DIRS =
 endif
 
 SUBDIRS = \
-       Include \
+        Include \
         Aircraft \
         Airports \
+        ATC \
         Autopilot \
         Cockpit \
         Controls \
         FDM \
         GUI \
-        Joystick \
-       Navaids \
+        Input \
+       Instrumentation \
+        Model \
+        Navaids \
+        Network \
+       $(MPLAYER_DIRS) \
         $(NETWORK_DIRS) \
         Objects \
         Scenery \
+        $(SCRIPTING_DIRS) \
+        Sound \
+        Systems \
         Time \
         $(WEATHER_DIR) \
         Main