diff options
| author | Philip Kovacs <phil@philkovacs.com> | 2011-11-21 08:10:03 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-11-21 08:10:03 +0100 |
| commit | bf9062902c776c0c6029ef42c6ba0c7179bf0425 (patch) | |
| tree | 59a20726d459102fe3048531cb305b7c687d9b4c | |
| parent | 5c1a91e33e552b136a0a72027ef27f41de95dcb8 (diff) | |
Fix broken VPATH/parallel builds
Signed-off-by: Philip Kovacs <phil@philkovacs.com>
| -rw-r--r-- | doc/Makefile.am | 8 | ||||
| -rw-r--r-- | perf/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index ff00c18..103652f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -29,11 +29,11 @@ if BUILD_DOC SUFFIXES=.html .txt .xml .3 .7 .txt.html: - asciidoc -d manpage -b xhtml11 -f asciidoc.conf \ - -azmq_version=@PACKAGE_VERSION@ $< + asciidoc -d manpage -b xhtml11 -f $(srcdir)/asciidoc.conf \ + -azmq_version=@PACKAGE_VERSION@ -o$@ $< .txt.xml: - asciidoc -d manpage -b docbook -f asciidoc.conf \ - -azmq_version=@PACKAGE_VERSION@ $< + asciidoc -d manpage -b docbook -f $(srcdir)/asciidoc.conf \ + -azmq_version=@PACKAGE_VERSION@ -o$@ $< .xml.1: xmlto man $< .xml.3: diff --git a/perf/Makefile.am b/perf/Makefile.am index 0f5e78e..4053ba5 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,4 +1,5 @@ -INCLUDES = -I$(top_builddir)/include +INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr inproc_lat inproc_thr diff --git a/tests/Makefile.am b/tests/Makefile.am index bbae270..fb0c6f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,6 @@ -INCLUDES = -I$(top_builddir)/include +INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include + LDADD = $(top_builddir)/src/libzmq.la noinst_PROGRAMS = test_pair_inproc \ |