X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=9bd77efc97dff0fb92b24c5ade92d93e2e20d483;hb=e4a8896fdc98d29bc0af16bda19599e53f259d1c;hp=9bdce9d4d4860b837a68dbb5ac6d2a8574c354bf;hpb=00ccafb90de6f22ec3c80308acde0c29e692157d;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 9bdce9d4..9bd77efc 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,19 +1,14 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
-else
-SERIAL_DIRS =
-endif
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
 
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
+include_HEADERS = \
+	compiler.h constants.h sg_inlines.h version.h
 
-if HAVE_ZLIB
-ZLIB_DIRS =
+if WANT_HEADLESS
+SG_EXTRA_DIRS =
+METAR_DIRS = 
 else
-ZLIB_DIRS = zlib
+SG_EXTRA_DIRS = scene sound screen
+METAR_DIRS = environment
 endif
 
 if HAVE_THREADS
@@ -22,30 +17,27 @@ else
 SGTHREAD_DIR = 
 endif
 
-# METAR_DIRS =
-METAR_DIRS = metar
-
-EXTRA_DIST = version.h.in
-
-include_HEADERS = \
-	compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
-
-SUBDIRS = \
-	$(ZLIB_DIRS) \
-	bucket \
+SUBDIRS_ALWAYS = \
+	xml \
 	debug \
+	misc \
+	structure \
+	bucket \
 	ephemeris \
+	io \
 	magvar \
 	math \
-	$(METAR_DIRS) \
-	xml \
-	misc \
-	io \
+	nasal \
+	props \
 	route \
-	screen \
-	$(SERIAL_DIRS) \
-	sky \
-	$(SGTHREAD_DIR) \
-	timing \
-	xgl
+	serial \
+	timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+	$(compatibility_DIR) \
+	$(METAR_DIRS) \
+	$(SG_EXTRA_DIRS) \
+	$(SGTHREAD_DIR)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads