summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTony Garnock-Jones <tonygarnockjones@gmail.com>2010-12-17 13:37:18 -0500
committerTony Garnock-Jones <tonygarnockjones@gmail.com>2010-12-17 13:37:18 -0500
commit2b36b0c508af42e4d092342ca1b530e2e911267a (patch)
tree438916248670d05fea17fd8d869ae0ca6a0ba68a /tools
parent695d49b753c3c7dd04c49a16e185835b84f7a9da (diff)
downloadrabbitmq-c-github-ask-2b36b0c508af42e4d092342ca1b530e2e911267a.tar.gz
More fixes for VPATH-based builds
Reported by Tony Garnock-Jones.
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ccd36ca..6fa1e4b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,7 +2,11 @@ SUBDIRS=doc
bin_PROGRAMS = amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue
-AM_CFLAGS = -I$(top_srcdir)/librabbitmq -I$(srcdir)/$(PLATFORM_DIR)
+# The -I to srcdir's librabbitmq is for the main amqp header
+# files. The -I to builddir's librabbitmq is less obvious; it's for
+# VPATH-based builds: the amqp_framing.h gets generated into the
+# *build* directory, not the source directory.
+AM_CFLAGS = -I$(top_srcdir)/librabbitmq -I$(srcdir)/$(PLATFORM_DIR) -I$(top_builddir)/librabbitmq
AM_LDFLAGS = $(top_builddir)/librabbitmq/librabbitmq.la
LDADD=$(LIBPOPT)