Removes some references (in comments / disabled code) to Point3D

[flightgear.git] / src / Makefile.am

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