Change int to GLenum for portability.

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 106162cdf74d65dd00926a83874f89d0c47d2d78..c9669b292aac296554d30305ffcceec2eb687cb7 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,26 +7,27 @@ 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 \
+       xml \
        debug \
+       misc \
+       bucket \
        ephemeris \
        io \
        magvar \
        math \
        $(METAR_DIRS) \
-       xml \
-       misc \
        route \
        screen \
-       $(SERIAL_DIRS) \
+       serial \
        sky \
        $(SGTHREAD_DIR) \
        timing \
-       xgl \
-       $(ZLIB_DIRS)
+       xgl
+
+DIST_SUBDIRS = $(SUBDIRS)