X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=de98c035aaa3db6359633d213f2427eb13703ced;hb=f19e83dcf10d5fced3d799c884a4654d7ada6548;hp=b0581e423c4ff99a28f2e735100936dc76de3cbe;hpb=4f76c258afad302ed312d143459ccaa61d1fbfd2;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index b0581e42..de98c035 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,51 +1,31 @@
-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
-SGTHREAD_DIR = 
-endif
-
 # METAR_DIRS =
-METAR_DIRS = metar
+METAR_DIRS = environment
 
-EXTRA_DIST = simgear_config.h.vc5 version.h.in
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 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 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 \
-	$(SGTHREAD_DIR) \
-	timing \
-	xgl
+	serial \
+	sound \
+	threads \
+	timing
 
+DIST_SUBDIRS = $(SUBDIRS) compatibility