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

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 826f93d0078eec9335e93744fe4e7fc0dafbd9b2..39b081ac151c84d4530f78af7f9d545778c94321 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,32 @@
-if ENABLE_OLD_WEATHER
-WEATHER_DIR = Weather
+if ENABLE_ATCDCL
+ATCDCL_DIR = ATCDCL
 else
-WEATHER_DIR = WeatherCM
+ATCDCL_DIR = 
 endif
 
-if ENABLE_NETWORK_OLK
-NETWORK_DIRS = Network NetworkOLK
-else
-NETWORK_DIRS = Network
-endif
 
 SUBDIRS = \
-       Include \
+        Include \
         Aircraft \
         Airports \
+       ATC \
+        $(ATCDCL_DIR) \
         Autopilot \
         Cockpit \
-        Controls \
+        Environment \
         FDM \
         GUI \
-        Joystick \
-       Navaids \
-        $(NETWORK_DIRS) \
-        Objects \
+        Input \
+       Instrumentation \
+        Model \
+       AIModel \
+        Navaids \
+        Network \
+       MultiPlayer \
         Scenery \
+       Scripting \
+        Sound \
+        Systems \
         Time \
-        $(WEATHER_DIR) \
+       Traffic \
         Main