X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=d4a9b6059d8d4978d0969e80dae1ae7a5e6d8dd2;hb=10217a3b19f690624e42b224a6fb08b6673c3edd;hp=7d62acec4ae8e5d0808a55ab654b9ba06648cfc8;hpb=e07af680183126847f1547a7ad8101e43fbe9023;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 7d62acec..d4a9b605 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,44 +1,50 @@
-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
 
-# METAR_DIRS =
-METAR_DIRS = metar
-
-EXTRA_DIST = version.h.in
-
-include_HEADERS = \
-	compiler.h constants.h fg_traits.hxx fg_zlib.h inlines.h version.h
+if HAVE_THREADS
+SGTHREAD_DIR = threads
+else
+SGTHREAD_DIR = 
+endif
 
-SUBDIRS = \
-	bucket \
+SUBDIRS_ALWAYS = \
+	xml \
 	debug \
+	misc \
+	structure \
+	bucket \
 	ephemeris \
+	$(HLA_DIR) \
+	$(SGTHREAD_DIR) \
 	io \
 	magvar \
 	math \
-	$(METAR_DIRS) \
-	xml \
-	misc \
+	nasal \
+	props \
 	route \
-	screen \
-	$(SERIAL_DIRS) \
-	sky \
-	timing \
-	xgl \
-	$(ZLIB_DIRS)
+	serial \
+	timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+	$(compatibility_DIR) \
+	$(METAR_DIRS) \
+	$(SG_EXTRA_DIRS)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads