Patch from Frederic Bouvier:

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 3078a18defcc88b36ade144de5736d935f03b4e8..2edf0ce7d158c9090960d17fa2d08762d41bd9c0 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,45 +1,34 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
+if HAVE_THREADS
+SGTHREAD_DIR = threads
 else
-SERIAL_DIRS =
-endif
-
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
-
-if HAVE_ZLIB
-ZLIB_DIRS =
-else
-ZLIB_DIRS = zlib
+SGTHREAD_DIR = 
 endif
 
 # 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 sg_inlines.h sg_traits.hxx sg_zlib.h version.h
 
 SUBDIRS = \
-       bucket \
+       compatibility \
+       xml \
        debug \
+       misc \
+       bucket \
        ephemeris \
        io \
        magvar \
        math \
        $(METAR_DIRS) \
-       xml \
-       misc \
        route \
        screen \
-       $(SERIAL_DIRS) \
+       serial \
        sky \
-        threads \
+       $(SGTHREAD_DIR) \
        timing \
-       xgl \
-       $(ZLIB_DIRS)
+       xgl
 
+DIST_SUBDIRS = $(SUBDIRS)