X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=24cda43443a7308c195affbfd2028b1dae18900f;hb=8c783b168093f43f188f21988bd9b88a9eae9ccb;hp=6cddb53032e2ab27ae2294360380dabe6cca4520;hpb=6a481eed3616bd1c889d589bcee4d3d19eb26325;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 6cddb530..24cda434 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,34 @@ 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) \
+	$(compatibility_DIR) \
 	xml \
 	debug \
 	misc \
+	structure \
 	bucket \
 	ephemeris \
 	io \
 	magvar \
 	math \
 	$(METAR_DIRS) \
+	nasal \
+	props \
 	route \
+	scene \
 	screen \
-	$(SERIAL_DIRS) \
-	sky \
+	serial \
+	sound \
 	$(SGTHREAD_DIR) \
 	timing \
 	xgl
 
+DIST_SUBDIRS = $(SUBDIRS) compatibility threads