summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/Makefile.am6
-rw-r--r--tools/Makefile.am6
2 files changed, 10 insertions, 2 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ea10f77..bde66bd 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,10 @@
noinst_PROGRAMS = amqp_sendstring amqp_exchange_declare amqp_listen amqp_producer amqp_consumer amqp_unbind amqp_bind amqp_listenq
-AM_CFLAGS = -I$(top_srcdir)/librabbitmq
+# 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$(top_builddir)/librabbitmq
if GCC
# Because we want to build under Microsoft's C compiler (for which
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)