-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Committed; thanks.
Tim
Hans Ulrich Niedermann wrote:
> 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.
>
>
> ------------------------------------------------------------------------
>
> Index: simgear/bucket/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/bucket/Makefile.am,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile.am
> --- simgear/bucket/Makefile.am 7 Sep 2002 02:58:19 -0000 1.1.1.1
> +++ simgear/bucket/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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)
> Index: simgear/io/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/io/Makefile.am,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile.am
> --- simgear/io/Makefile.am 27 Dec 2003 09:31:02 -0000 1.5
> +++ simgear/io/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -27,7 +27,7 @@ noinst_PROGRAMS = decode_binobj socktest
> 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 \
> Index: simgear/magvar/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/magvar/Makefile.am,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile.am
> --- simgear/magvar/Makefile.am 29 Aug 2003 07:35:56 -0000 1.2
> +++ simgear/magvar/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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)
> Index: simgear/misc/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/misc/Makefile.am,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile.am
> --- simgear/misc/Makefile.am 22 Sep 2005 09:11:28 -0000 1.11
> +++ simgear/misc/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -26,10 +26,16 @@ noinst_PROGRAMS = tabbed_value_test swap
>
> 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)
> Index: simgear/props/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/props/Makefile.am,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile.am
> --- simgear/props/Makefile.am 25 Sep 2003 08:22:41 -0000 1.3
> +++ simgear/props/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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 \
> Index: simgear/route/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/route/Makefile.am,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile.am
> --- simgear/route/Makefile.am 23 Dec 2006 12:15:05 -0000 1.3
> +++ simgear/route/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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)
> Index: simgear/screen/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/screen/Makefile.am,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile.am
> --- simgear/screen/Makefile.am 14 Dec 2005 10:28:16 -0000 1.12
> +++ simgear/screen/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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
> Index: simgear/serial/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/serial/Makefile.am,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile.am
> --- simgear/serial/Makefile.am 7 Sep 2002 02:58:19 -0000 1.1.1.1
> +++ simgear/serial/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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)
> Index: simgear/sound/Makefile.am
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/source/simgear/sound/Makefile.am,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile.am
> --- simgear/sound/Makefile.am 23 Jan 2007 10:07:36 -0000 1.6
> +++ simgear/sound/Makefile.am 22 Jul 2007 13:53:41 -0000
> @@ -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 \
>
>
> ------------------------------------------------------------------------
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems? Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >> http://get.splunk.com/
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Flightgear-devel mailing list
> Flightgear-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/flightgear-devel
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iD8DBQFGo9x5eDhWHdXrDRURAuXHAJwLUH0fOdpNwME9kDTCcxxB5O15OQCfa2nt
tOspM9nmgsKtRHhxe2QNzeg=
=WXwl
-----END PGP SIGNATURE-----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
