X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=d88af9347d08c9fa2a49669cbebeb127558d7342;hb=32cb0df98e470bf83efaa16670fb3b706c2e7053;hp=86c9491f019f92e864d3189d447cd773dad834bc;hpb=625572663e47fb4d801a3f18e7f83971da5bb519;p=flightgear.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 86c9491f0..d88af9347 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,29 @@
-if ENABLE_NEW_ENVIRONMENT
+if ENABLE_WEATHERCM
+WEATHER_DIR = WeatherCM
+else
 WEATHER_DIR = Environment
+endif
+
+if HAVE_PLIB_PSL
+SCRIPTING_DIRS = Scripting
 else
-WEATHER_DIR = WeatherCM
+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 \
@@ -20,13 +32,19 @@ SUBDIRS = \
         Controls \
         FDM \
         GUI \
-	Input \
+        Input \
+	Instrumentation \
         Model \
-	Navaids \
+        Navaids \
+        Network \
+	$(MPLAYER_DIRS) \
         $(NETWORK_DIRS) \
         Objects \
+	Replay \
         Scenery \
-	Sound \
+        $(SCRIPTING_DIRS) \
+        Sound \
+        Systems \
         Time \
         $(WEATHER_DIR) \
         Main