X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=d4a9b6059d8d4978d0969e80dae1ae7a5e6d8dd2;hb=778cc4c4352484a3d4d9191c7b19d51512565bda;hp=cdba18bc2da4fcc391b68da912c97ac03757f3ab;hpb=b5705ff47a847ebbd6cf78130bdb710692e4fdd3;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index cdba18bc..d4a9b605 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,40 +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 \
+	nasal \
+	props \
+	route \
+	serial \
+	timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+	$(compatibility_DIR) \
 	$(METAR_DIRS) \
-	misc \
-	screen \
-	$(SERIAL_DIRS) \
-	sky \
-	xgl \
-	$(ZLIB_DIRS)
+	$(SG_EXTRA_DIRS)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads