clouds: remove unused bump mapping flags.

[simgear.git] / simgear / Makefile.am

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index c9669b292aac296554d30305ffcceec2eb687cb7..d4a9b6059d8d4978d0969e80dae1ae7a5e6d8dd2 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,33 +1,50 @@
-if HAVE_THREADS
-SGTHREAD_DIR = threads
+if ENABLE_HLA
+HLA_DIR = hla
 else
-SGTHREAD_DIR = 
+HLA_DIR =
 endif
 
-# METAR_DIRS =
-METAR_DIRS = metar
-
-EXTRA_DIST = simgear_config.h.vc5 version.h.in
+EXTRA_DIST = hla simgear_config.h-msvc90 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
+
+if WANT_HEADLESS
+SG_EXTRA_DIRS =
+METAR_DIRS = 
+else
+SG_EXTRA_DIRS = scene sound screen
+METAR_DIRS = environment
+endif
 
-SUBDIRS = \
+if HAVE_THREADS
+SGTHREAD_DIR = threads
+else
+SGTHREAD_DIR = 
+endif
+
+SUBDIRS_ALWAYS = \
        xml \
        debug \
        misc \
+       structure \
        bucket \
        ephemeris \
+       $(HLA_DIR) \
+       $(SGTHREAD_DIR) \
        io \
        magvar \
        math \
-       $(METAR_DIRS) \
+       nasal \
+       props \
        route \
-       screen \
        serial \
-       sky \
-       $(SGTHREAD_DIR) \
-       timing \
-       xgl
+       timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+       $(compatibility_DIR) \
+       $(METAR_DIRS) \
+       $(SG_EXTRA_DIRS)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
 
-DIST_SUBDIRS = $(SUBDIRS)