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

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 7d62acec..24cda434 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,44 +1,38 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
+if HAVE_THREADS
+SGTHREAD_DIR = threads
 else
-SERIAL_DIRS =
-endif
-
-# if HAVE_GDBM
-# GDBM_DIRS =
-# else
-# GDBM_DIRS = gdbm
-# endif
-
-if HAVE_ZLIB
-ZLIB_DIRS =
-else
-ZLIB_DIRS = zlib
+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 fg_traits.hxx fg_zlib.h inlines.h version.h
+	compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
 
 SUBDIRS = \
-	bucket \
+	$(compatibility_DIR) \
+	xml \
 	debug \
+	misc \
+	structure \
+	bucket \
 	ephemeris \
 	io \
 	magvar \
 	math \
 	$(METAR_DIRS) \
-	xml \
-	misc \
+	nasal \
+	props \
 	route \
+	scene \
 	screen \
-	$(SERIAL_DIRS) \
-	sky \
+	serial \
+	sound \
+	$(SGTHREAD_DIR) \
 	timing \
-	xgl \
-	$(ZLIB_DIRS)
+	xgl
 
+DIST_SUBDIRS = $(SUBDIRS) compatibility threads