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

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