Merge branch 'jmt/magvar' into next

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 77036479518010923bd4341a19efddf014db7383..de98c035aaa3db6359633d213f2427eb13703ced 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,16 +1,10 @@
-if HAVE_THREADS
-SGTHREAD_DIR = threads
-else
-SGTHREAD_DIR = 
-endif
-
 # METAR_DIRS =
-METAR_DIRS = metar environment
+METAR_DIRS = environment
 
-EXTRA_DIST = simgear_config.h.vc5 version.h.in
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
 
 include_HEADERS = \
-       compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
+       compiler.h constants.h sg_inlines.h version.h
 
 SUBDIRS = \
        $(compatibility_DIR) \
@@ -31,8 +25,7 @@ SUBDIRS = \
        screen \
        serial \
        sound \
-       $(SGTHREAD_DIR) \
-       timing \
-       xgl
+       threads \
+       timing
 
-DIST_SUBDIRS = $(SUBDIRS) compatibility metar threads
+DIST_SUBDIRS = $(SUBDIRS) compatibility