Patch from Melchior Franz:

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index baf586c7b7ca03692e34b69aabf7a8899943d3f2..b8c05870601da0372a8f90adf7e3ff566de06236 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -4,41 +4,35 @@ else
 SERIAL_DIRS =
 endif
 
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
-
-if HAVE_ZLIB
-ZLIB_DIRS =
+if HAVE_THREADS
+SGTHREAD_DIR = threads
 else
-ZLIB_DIRS = zlib
+SGTHREAD_DIR = 
 endif
 
-METAR_DIRS =
-# METAR_DIRS = metar
+# METAR_DIRS =
+METAR_DIRS = metar
 
-EXTRA_DIST = version.h.in
+EXTRA_DIST = simgear_config.h.vc5 version.h.in
 
 include_HEADERS = \
-       compiler.h constants.h fg_traits.hxx fg_zlib.h inlines.h version.h
+       compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
 
 SUBDIRS = \
-       bucket \
+       xml \
        debug \
+       misc \
+       bucket \
        ephemeris \
        io \
        magvar \
        math \
        $(METAR_DIRS) \
-       xml \
-       misc \
        route \
        screen \
        $(SERIAL_DIRS) \
        sky \
+       $(SGTHREAD_DIR) \
        timing \
-       xgl \
-       $(ZLIB_DIRS)
+       xgl