X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=d4a9b6059d8d4978d0969e80dae1ae7a5e6d8dd2;hb=e4e31be7d43569a92a5d9fa7e784381b66cbd95a;hp=1f8e677d6fc45fb6b82ff979107a36016e50cda8;hpb=7ea241b412db100f7cc218957cd64f5edd0ce1e8;p=simgear.git

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