X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=ce31e6ebb9789f6ef74c93671d887becf4e05a27;hb=56592f3869c41e4f189e9ab44abb1a0898c90f4b;hp=d1a55d76f51f7e7b89a924870782c71c9e0e7837;hpb=71f120e3be081101c9c00544ab65942e96a34874;p=flightgear.git

diff --git a/src/Makefile.am b/src/Makefile.am
index d1a55d76f..ce31e6ebb 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,12 +32,18 @@ SUBDIRS = \
         Controls \
         FDM \
         GUI \
-	Input \
-	Navaids \
+        Input \
+	Instrumentation \
+        Model \
+        Navaids \
+        Network \
+	$(MPLAYER_DIRS) \
         $(NETWORK_DIRS) \
         Objects \
         Scenery \
-	Sound \
+        $(SCRIPTING_DIRS) \
+        Sound \
+        Systems \
         Time \
         $(WEATHER_DIR) \
         Main