From 25750ca71fa119430b722df6be2d557e375158f8 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 2 Feb 2013 01:26:43 +0100 Subject: [PATCH] Allow out-of-tree builds The generated header file lcc_features.h and collectd.h cause problems otherwise. Signed-off-by: Florian Forster --- src/Makefile.am | 1 + src/libcollectdclient/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 45fd9f93..992b7f16 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' +AM_CPPFLAGS += -I$(top_builddir)/src/libcollectdclient/collectd sbin_PROGRAMS = collectd collectdmon bin_PROGRAMS = collectd-nagios collectdctl collectd-tg diff --git a/src/libcollectdclient/Makefile.am b/src/libcollectdclient/Makefile.am index 7167f517..1d4dff59 100644 --- a/src/libcollectdclient/Makefile.am +++ b/src/libcollectdclient/Makefile.am @@ -11,7 +11,7 @@ nodist_pkgconfig_DATA = libcollectdclient.pc BUILT_SOURCES = collectd/lcc_features.h libcollectdclient_la_SOURCES = client.c network.c network_buffer.c -libcollectdclient_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src +libcollectdclient_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd -I$(top_srcdir)/src libcollectdclient_la_LDFLAGS = -version-info 1:0:0 libcollectdclient_la_LIBADD = if BUILD_WITH_LIBGCRYPT -- 2.11.0