remove CopyPolicy from ModelRegistry

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 855b42dc3732cd4efc3581caf598140dfd1aa60a..44e28bb1b1c9db61e86f4c246d8485a25b0f8211 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
@@ -23,28 +5,33 @@ SGTHREAD_DIR =
 endif
 
 # METAR_DIRS =
-METAR_DIRS = metar
+METAR_DIRS = environment
 
-EXTRA_DIST = version.h.in
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 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 version.h
 
 SUBDIRS = \
-       bucket \
+       $(compatibility_DIR) \
+       xml \
        debug \
+       misc \
+       structure \
+       bucket \
        ephemeris \
        io \
        magvar \
        math \
        $(METAR_DIRS) \
-       xml \
-       misc \
+       nasal \
+       props \
        route \
+       scene \
        screen \
-       $(SERIAL_DIRS) \
-       sky \
-       $(SGTHREAD_DIR)
-       timing \
-       xgl \
-       $(ZLIB_DIRS)
+       serial \
+       sound \
+       $(SGTHREAD_DIR) \
+       timing
+
+DIST_SUBDIRS = $(SUBDIRS) compatibility