Nasal and event manager updates from Andy Ross.

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 6cddb53032e2ab27ae2294360380dabe6cca4520..26761fe836a723c16a5d5e2b368349dbc99f1634 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,21 +1,3 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
-else
-SERIAL_DIRS =
-endif
-
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
-
-if HAVE_ZLIB
-ZLIB_DIRS =
-else
-ZLIB_DIRS = zlib
-endif
-
 if HAVE_THREADS
 SGTHREAD_DIR = threads
 else
@@ -25,27 +7,32 @@ 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
+       compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
 
 SUBDIRS = \
-       $(ZLIB_DIRS) \
+       $(compatibility_DIR) \
        xml \
        debug \
        misc \
+       structure \
        bucket \
        ephemeris \
        io \
        magvar \
        math \
        $(METAR_DIRS) \
+       nasal \
+       props \
        route \
+       scene \
        screen \
-       $(SERIAL_DIRS) \
-       sky \
+       serial \
+       sound \
        $(SGTHREAD_DIR) \
        timing \
        xgl
 
+DIST_SUBDIRS = $(SUBDIRS) compatibility metar threads