]> granicus.if.org Git - procps-ng/commit
Merge branch 'fix_parallel_build' into 'master'
authorCraig Small <csmall@enc.com.au>
Wed, 13 May 2015 11:57:10 +0000 (11:57 +0000)
committerCraig Small <csmall@enc.com.au>
Wed, 13 May 2015 11:57:10 +0000 (11:57 +0000)
commit2753a8f3db9c164a375c2013fd96606b571631ee
treecd909961af218613d47ad747c2b85a4f9952a06f
parent90f76a809135ed811d7ead5affa09220ef24b0bf
parent5cabea840949ae7df36799b9bd1f740c07a51191
Merge branch 'fix_parallel_build' into 'master'

build-sys: use proper dependencies on libproc.la

Use `LDADD` or `*_LDADD` instead of `AM_LDFLAGS` to refer to `libproc.la`.

This is recommended in the automake manual:
http://www.gnu.org/software/automake/manual/html_node/Linking.html

Before this commit, parallel builds may break, as there is no explicit dependency to ensure the library is built before the binaries that try to link to it.

Tested by running `make -jNN` repeatedly for different levels of parallelism to ensure the build works. Also checked that `make check` and `make distcheck` still work as expected. Also made sure that a parallel make invocation works with `make -j distcheck`.

Reported-by: Jim Warner <james.warner@comcast.net>
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
See merge request !2