Fix BTG writer for non-included index arrays.

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index b0581e423c4ff99a28f2e735100936dc76de3cbe..d4a9b6059d8d4978d0969e80dae1ae7a5e6d8dd2 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,19 +1,20 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
+if ENABLE_HLA
+HLA_DIR = hla
 else
-SERIAL_DIRS =
+HLA_DIR =
 endif
 
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
+EXTRA_DIST = hla simgear_config.h-msvc90 version.h.in
 
-if HAVE_ZLIB
-ZLIB_DIRS =
+include_HEADERS = \
+       compiler.h constants.h sg_inlines.h version.h
+
+if WANT_HEADLESS
+SG_EXTRA_DIRS =
+METAR_DIRS = 
 else
-ZLIB_DIRS = zlib
+SG_EXTRA_DIRS = scene sound screen
+METAR_DIRS = environment
 endif
 
 if HAVE_THREADS
@@ -22,30 +23,28 @@ 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 sg_zlib.h version.h
-
-SUBDIRS = \
-       $(ZLIB_DIRS) \
+SUBDIRS_ALWAYS = \
        xml \
        debug \
        misc \
+       structure \
        bucket \
        ephemeris \
+       $(HLA_DIR) \
+       $(SGTHREAD_DIR) \
        io \
        magvar \
        math \
-       $(METAR_DIRS) \
+       nasal \
+       props \
        route \
-       screen \
-       $(SERIAL_DIRS) \
-       sky \
-       $(SGTHREAD_DIR) \
-       timing \
-       xgl
+       serial \
+       timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+       $(compatibility_DIR) \
+       $(METAR_DIRS) \
+       $(SG_EXTRA_DIRS)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads