std::string::c_str() is const

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 106162cdf74d65dd00926a83874f89d0c47d2d78..9bd77efc97dff0fb92b24c5ade92d93e2e20d483 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,19 +1,14 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
-else
-SERIAL_DIRS =
-endif
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
 
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
+include_HEADERS = \
+       compiler.h constants.h sg_inlines.h version.h
 
-if HAVE_ZLIB
-ZLIB_DIRS =
+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,29 +17,27 @@ else
 SGTHREAD_DIR = 
 endif
 
-# METAR_DIRS =
-METAR_DIRS = metar
-
-EXTRA_DIST = version.h.in
-
-include_HEADERS = \
-       compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
-
-SUBDIRS = \
-       bucket \
+SUBDIRS_ALWAYS = \
+       xml \
        debug \
+       misc \
+       structure \
+       bucket \
        ephemeris \
        io \
        magvar \
        math \
-       $(METAR_DIRS) \
-       xml \
-       misc \
+       nasal \
+       props \
        route \
-       screen \
-       $(SERIAL_DIRS) \
-       sky \
-       $(SGTHREAD_DIR) \
-       timing \
-       xgl \
-       $(ZLIB_DIRS)
+       serial \
+       timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+       $(compatibility_DIR) \
+       $(METAR_DIRS) \
+       $(SG_EXTRA_DIRS) \
+       $(SGTHREAD_DIR)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
+