X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=9bd77efc97dff0fb92b24c5ade92d93e2e20d483;hb=956b4406d0e57be455381bcc06a3d5855034e471;hp=4bfc91ff33f8e2c227ef0354afe0fe4c3691e5b8;hpb=4c79263dcff9072897089540be9876d6f21b794c;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 4bfc91ff..9bd77efc 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,31 +1,43 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
+
+include_HEADERS = \
+	compiler.h constants.h sg_inlines.h version.h
+
+if WANT_HEADLESS
+SG_EXTRA_DIRS =
+METAR_DIRS = 
 else
-SERIAL_DIRS =
+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 \
+	misc \
+	structure \
+	bucket \
+	ephemeris \
+	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) \
+	$(SGTHREAD_DIR)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads