The code to find the highest hit below you didn't work quite right when

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a1ab792e61f80b8a6e50210c5f00a5f437d75414..c2bfba177e39c55c6cdeea5e07330c7eecf76891 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,43 @@
-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_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 \
-        Astro \
+        ATC \
         Autopilot \
-        Clouds \
         Cockpit \
         Controls \
         FDM \
         GUI \
-        Joystick \
-        $(NETWORK_DIRS) \
+        Input \
+       Instrumentation \
+        Model \
+        Navaids \
+        Network \
+       $(MPLAYER_DIRS) \
         Objects \
+       Replay \
         Scenery \
-       Sky \
+        $(SCRIPTING_DIRS) \
+        Sound \
+        Systems \
         Time \
         $(WEATHER_DIR) \
         Main