[zeromq-dev] [PATCH] libzmq: Fix-broken-VPATH-parallel-builds

[Philip Kovacs]

Attached is a separate patch that solely fixes VPATH/parallel build problems.
The errors are seen when performing out of tree builds with problems in the doc, 
perf and tests areas.

To replicate from a fresh clone:

got clone git://github.com/zeromq/libzmq.git
cd libzmq
sh autogen.sh
mkdir work
cd work
../configure 
make

The build will fail in the doc area if you have the doc tools: asciidoc, xmlto.
The perf and tests areas are also affected.

(I should not have mixed this problem with the include area discussion as this problem 
is definitive and the other was debatable).

Phil
-------------- next part --------------
From 052ca926dd811e337fbddda0692f7763c3817ec4 Mon Sep 17 00:00:00 2001
From: Philip Kovacs <http://philkovacs.com/>
Date: Tue, 15 Nov 2011 15:12:08 -0500
Subject: [PATCH] Fix broken VPATH/parallel builds Signed-off-by: Philip
 Kovacs <http://philkovacs.com/>

---
 doc/Makefile.am   |    8 ++++----
 perf/Makefile.am  |    3 ++-
 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 \
-- 
1.7.8.rc1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <https://lists.zeromq.org/pipermail/zeromq-dev/attachments/20111115/13775738/attachment.sig>