MSVC improvements from Olaf Flebbe.

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 3c32c5191a938ee4f04ee34c96099a8c770d2272..9bd77efc97dff0fb92b24c5ade92d93e2e20d483 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,19 +1,23 @@
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
+
+include_HEADERS = \
+       compiler.h constants.h sg_inlines.h version.h
+
+if WANT_HEADLESS
+SG_EXTRA_DIRS =
+METAR_DIRS = 
+else
+SG_EXTRA_DIRS = scene sound screen
+METAR_DIRS = environment
+endif
+
 if HAVE_THREADS
 SGTHREAD_DIR = threads
 else
 SGTHREAD_DIR = 
 endif
 
-# METAR_DIRS =
-METAR_DIRS = metar
-
-EXTRA_DIST = simgear_config.h.vc5 version.h.in
-
-include_HEADERS = \
-       compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
-
-SUBDIRS = \
-       $(compatibility_DIR) \
+SUBDIRS_ALWAYS = \
        xml \
        debug \
        misc \
@@ -23,15 +27,17 @@ SUBDIRS = \
        io \
        magvar \
        math \
-       $(METAR_DIRS) \
+       nasal \
        props \
        route \
-       scene \
-       screen \
        serial \
-       sound \
-       $(SGTHREAD_DIR) \
-       timing \
-       xgl
+       timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+       $(compatibility_DIR) \
+       $(METAR_DIRS) \
+       $(SG_EXTRA_DIRS) \
+       $(SGTHREAD_DIR)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
 
-DIST_SUBDIRS = $(SUBDIRS) compatibility metar threads