X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2FMakefile.am;h=d4a9b6059d8d4978d0969e80dae1ae7a5e6d8dd2;hb=64b6a4ebf25e215e9d3d75e0cce65ee95177fd5d;hp=26761fe836a723c16a5d5e2b368349dbc99f1634;hpb=34e2a9dc374914418d0a414490e10e1264c0a146;p=simgear.git

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 26761fe8..d4a9b605 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,38 +1,50 @@
-if HAVE_THREADS
-SGTHREAD_DIR = threads
+if ENABLE_HLA
+HLA_DIR = hla
 else
-SGTHREAD_DIR = 
+HLA_DIR =
 endif
 
-# METAR_DIRS =
-METAR_DIRS = metar
-
-EXTRA_DIST = simgear_config.h.vc5 version.h.in
+EXTRA_DIST = hla simgear_config.h-msvc90 version.h.in
 
 include_HEADERS = \
-	compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
+	compiler.h constants.h sg_inlines.h version.h
 
-SUBDIRS = \
-	$(compatibility_DIR) \
+if WANT_HEADLESS
+SG_EXTRA_DIRS =
+METAR_DIRS = 
+else
+SG_EXTRA_DIRS = scene sound screen
+METAR_DIRS = environment
+endif
+
+if HAVE_THREADS
+SGTHREAD_DIR = threads
+else
+SGTHREAD_DIR = 
+endif
+
+SUBDIRS_ALWAYS = \
 	xml \
 	debug \
 	misc \
 	structure \
 	bucket \
 	ephemeris \
+	$(HLA_DIR) \
+	$(SGTHREAD_DIR) \
 	io \
 	magvar \
 	math \
-	$(METAR_DIRS) \
 	nasal \
 	props \
 	route \
-	scene \
-	screen \
 	serial \
-	sound \
-	$(SGTHREAD_DIR) \
-	timing \
-	xgl
+	timing
+
+SUBDIRS = $(SUBDIRS_ALWAYS) \
+	$(compatibility_DIR) \
+	$(METAR_DIRS) \
+	$(SG_EXTRA_DIRS)
+
+DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
 
-DIST_SUBDIRS = $(SUBDIRS) compatibility metar threads