Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c943eafd4ad40600567f7937b17a7994085aa9b0..178419eb064efa6da3bc520000cf51b19c288cd3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,32 +1,25 @@
-if ENABLE_WEATHERCM
-WEATHER_DIR = WeatherCM
-else
-WEATHER_DIR = Environment
-endif
-
-if ENABLE_NETWORK_OLK
-NETWORK_DIRS = Network NetworkOLK
-else
-NETWORK_DIRS = Network
-endif
-
 SUBDIRS = \
-       Include \
+        Include \
         Aircraft \
         Airports \
-        ATC \
+       ATC \
+        ATCDCL \
         Autopilot \
         Cockpit \
-        Controls \
+        Environment \
         FDM \
         GUI \
-       Input \
+        Input \
+       Instrumentation \
         Model \
-       Navaids \
-        $(NETWORK_DIRS) \
-        Objects \
+       AIModel \
+        Navaids \
+        Network \
+       MultiPlayer \
         Scenery \
-       Sound \
+       Scripting \
+        Sound \
+        Systems \
         Time \
-        $(WEATHER_DIR) \
+       Traffic \
         Main