From: Mathias Froehlich <Mathias.Froehlich@web.de>
Date: Wed, 7 Sep 2011 16:37:02 +0000 (+0200)
Subject: Update the automake based build system to the last changes.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=35a449c7d07f82b41fdcbb78b7ee26b0dbc54564;p=simgear.git

Update the automake based build system to the last changes.
---

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index c1e24ed7..d4a9b605 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -31,6 +31,7 @@ SUBDIRS_ALWAYS = \
 	bucket \
 	ephemeris \
 	$(HLA_DIR) \
+	$(SGTHREAD_DIR) \
 	io \
 	magvar \
 	math \
@@ -43,8 +44,7 @@ SUBDIRS_ALWAYS = \
 SUBDIRS = $(SUBDIRS_ALWAYS) \
 	$(compatibility_DIR) \
 	$(METAR_DIRS) \
-	$(SG_EXTRA_DIRS) \
-	$(SGTHREAD_DIR)
+	$(SG_EXTRA_DIRS)
 
 DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
 
diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index e0086d86..5595e0ee 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -41,6 +41,7 @@ tcp_server_SOURCES = tcp_server.cxx
 tcp_server_LDADD = \
 	libsgio.a \
 	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -54,6 +55,7 @@ tcp_client_SOURCES = tcp_client.cxx
 tcp_client_LDADD = \
 	libsgio.a \
 	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -67,6 +69,7 @@ socktest_SOURCES = socktest.cxx
 socktest_LDADD = \
 	libsgio.a \
 	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -80,6 +83,7 @@ lowtest_SOURCES = lowtest.cxx
 lowtest_LDADD = \
 	libsgio.a \
 	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -89,6 +93,7 @@ decode_binobj_SOURCES = decode_binobj.cxx
 
 decode_binobj_LDADD = \
 	libsgio.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \