Allow parallel make ("make -j2") by giving make the opportunity to

determine dependencies.

As in subdirectory foo/bar, $(top_builddir)/foo/bar is defined to be the
current directory, this does not cause any regressions.

From Hans Ulrich Niedermann (hun@n-dimensional.de)

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index 6ae60ce3d241b3926a57b4cb0b27ede275c515e1..d1f7b692c9fcfbd1d19f8381fd9a121820bf7c5d 100644 (file)
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -11,7 +11,7 @@ libsgbucket_a_SOURCES = newbucket.cxx
 # testbucket_SOURCES = testbucket.cxx
 
 # testbucket_LDADD = \
-#      $(top_builddir)/bucket/libsgbucket.a \
+#      libsgbucket.a \
 #      $(top_builddir)/misc/libsgmisc.a
 
 INCLUDES = -I$(top_srcdir)

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d7149cf8ca73e8a094ed2afd3cd9bf28220ae79d..f5974659aa9a3e37e5f89886164ba21f62b656e9 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -27,7 +27,7 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 tcp_server_SOURCES = tcp_server.cxx
 
 tcp_server_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
+       libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -38,7 +38,7 @@ tcp_server_LDADD = \
 tcp_client_SOURCES = tcp_client.cxx
 
 tcp_client_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
+       libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -49,7 +49,7 @@ tcp_client_LDADD = \
 socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
+       libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -60,7 +60,7 @@ socktest_LDADD = \
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
+       libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -69,7 +69,7 @@ lowtest_LDADD = \
 decode_binobj_SOURCES = decode_binobj.cxx
 
 decode_binobj_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
+       libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \

diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am
index 619e283063b249c15a5a41078f8bdf8ce3de5121..03aa9789de2e195cbb5238814a79a89ae9ca37b8 100644 (file)
--- a/simgear/magvar/Makefile.am
+++ b/simgear/magvar/Makefile.am
@@ -13,7 +13,7 @@ noinst_PROGRAMS = testmagvar
 testmagvar_SOURCES = testmagvar.cxx
 
 testmagvar_LDADD = \
-       $(top_builddir)/simgear/magvar/libsgmagvar.a \
+       libsgmagvar.a \
        $(base_LIBS)
 
 INCLUDES = -I$(top_srcdir)

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 4e9b64ee19b1fcfdb3b01ede340175e13d6fabb0..980e032164ce1b5310b9df485e8659fe79ec0d14 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -26,10 +26,16 @@ noinst_PROGRAMS = tabbed_value_test swap_test
 
 tabbed_value_test_SOURCES = tabbed_values_test.cxx
 tabbed_value_test_LDADD = \
-       $(top_builddir)/simgear/misc/libsgmisc.a \
+       libsgmisc.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
        $(top_builddir)/simgear/debug/libsgdebug.a
 
+$(top_builddir)/simgear/xml/libsgxml.a:
+       cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
+
+$(top_builddir)/simgear/debug/libsgdebug.a:
+       cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
+
 swap_test_SOURCES = swap_test.cpp
 
 INCLUDES = -I$(top_srcdir)

diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index 30265b67e0c56310d7e4b2c085ca26cec94048c5..f1cf6f9a99c2779dd5bce157e3d22e57c6e0aec0 100644 (file)
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -16,7 +16,7 @@ noinst_PROGRAMS = props_test
 
 props_test_SOURCES = props_test.cxx
 props_test_LDADD = \
-       $(top_builddir)/simgear/props/libsgprops.a \
+       libsgprops.a \
        $(top_builddir)/simgear/xml/libsgxml.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \

diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am
index 7eb27878e46dc8be3fc49deffbb1fc9bafeae32e..d3d1f10002c22f6989b6feac86b324c48c2bccb9 100644 (file)
--- a/simgear/route/Makefile.am
+++ b/simgear/route/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = waytest routetest
 waytest_SOURCES = waytest.cxx
 
 waytest_LDADD = \
-       $(top_builddir)/simgear/route/libsgroute.a \
+       libsgroute.a \
        $(top_builddir)/simgear/math/libsgmath.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
@@ -28,7 +28,7 @@ waytest_LDADD = \
 routetest_SOURCES = routetest.cxx
 
 routetest_LDADD = \
-       $(top_builddir)/simgear/route/libsgroute.a \
+       libsgroute.a \
        $(top_builddir)/simgear/math/libsgmath.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(base_LIBS)

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 482bba619cb8ffb2945712e8069578d3332b3095..11e5a1d2fd86b7fd185c39a69122c7dad6f3afcf 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -41,7 +41,7 @@ noinst_PROGRAMS = TestRenderTexture
 TestRenderTexture_SOURCES = TestRenderTexture.cpp
 
 TestRenderTexture_LDADD = \
-       $(top_builddir)/simgear/screen/libsgscreen.a \
+       libsgscreen.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(opengl_LIBS)
 endif

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 17af84e2caa3ff35524d49874ea03f82d59a277d..0cace19c8779c81bcd260582bb3d2120f71ae98d 100644 (file)
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -11,7 +11,7 @@ noinst_PROGRAMS = testserial
 testserial_SOURCES = testserial.cxx
 
 testserial_LDADD = \
-       $(top_builddir)/simgear/serial/libsgserial.a \
+       libsgserial.a \
        $(top_builddir)/simgear/debug/libsgdebug.a
 
 INCLUDES = -I$(top_srcdir)

diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index 684303f1964cc15a499fe81a8ed23beedf1cae44..c627346369860620ee6f13668330c112e4842574 100644 (file)
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -26,7 +26,7 @@ openal_test1_LDADD = \
        $(openal_LIBS)
 
 openal_test2_LDADD = \
-       $(top_builddir)/simgear/sound/libsgsound.a \
+       libsgsound.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
        $(top_builddir)/simgear/structure/libsgstructure.a \