From 5fd514bde768c7de76e38349d17e581e8b949764 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 13 Apr 2017 12:06:20 +0200 Subject: [PATCH] libcollectdclient: Include headers with the "collectd/" path prefix. --- Makefile.am | 16 ++++++++-------- src/collectd-nagios.c | 2 +- src/collectd-tg.c | 4 ++-- src/collectdctl.c | 2 +- src/libcollectdclient/collectd/client.h | 4 ++-- src/libcollectdclient/collectd/network.h | 4 ++-- src/libcollectdclient/collectd/network_buffer.h | 4 ++-- src/libcollectdclient/collectd/types.h | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index c0334723..f8d911da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -244,8 +244,8 @@ collectdmon_SOURCES = src/collectdmon.c collectd_nagios_SOURCES = src/collectd-nagios.c collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient collectd_nagios_LDADD = libcollectdclient.la if BUILD_WITH_LIBSOCKET collectd_nagios_LDADD += -lsocket @@ -257,8 +257,8 @@ endif collectdctl_SOURCES = src/collectdctl.c collectdctl_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient collectdctl_LDADD = libcollectdclient.la if BUILD_WITH_LIBSOCKET collectdctl_LDADD += -lsocket @@ -270,8 +270,8 @@ endif collectd_tg_SOURCES = src/collectd-tg.c collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient collectd_tg_LDADD = \ $(PTHREAD_LIBS) \ libheap.la \ @@ -474,8 +474,8 @@ libcollectdclient_la_SOURCES = \ src/libcollectdclient/network_buffer.c libcollectdclient_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd \ + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient \ -I$(srcdir)/src/daemon libcollectdclient_la_LDFLAGS = -version-info 1:0:0 libcollectdclient_la_LIBADD = diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c index 993541d8..e106bb88 100644 --- a/src/collectd-nagios.c +++ b/src/collectd-nagios.c @@ -71,7 +71,7 @@ #endif #endif /* NAN_ZERO_ZERO */ -#include "libcollectdclient/collectd/client.h" +#include "collectd/client.h" #define RET_OKAY 0 #define RET_WARNING 1 diff --git a/src/collectd-tg.c b/src/collectd-tg.c index 3bde3259..a0fe2840 100644 --- a/src/collectd-tg.c +++ b/src/collectd-tg.c @@ -44,8 +44,8 @@ #include "utils_heap.h" -#include "libcollectdclient/collectd/client.h" -#include "libcollectdclient/collectd/network.h" +#include "collectd/client.h" +#include "collectd/network.h" #define DEF_NUM_HOSTS 1000 #define DEF_NUM_PLUGINS 20 diff --git a/src/collectdctl.c b/src/collectdctl.c index 248baadf..35e948e9 100644 --- a/src/collectdctl.c +++ b/src/collectdctl.c @@ -65,7 +65,7 @@ #endif #endif /* NAN_ZERO_ZERO */ -#include "libcollectdclient/collectd/client.h" +#include "collectd/client.h" #ifndef PREFIX #define PREFIX "/opt/" PACKAGE_NAME diff --git a/src/libcollectdclient/collectd/client.h b/src/libcollectdclient/collectd/client.h index d385e908..fd4899fc 100644 --- a/src/libcollectdclient/collectd/client.h +++ b/src/libcollectdclient/collectd/client.h @@ -27,8 +27,8 @@ #ifndef LIBCOLLECTD_COLLECTDCLIENT_H #define LIBCOLLECTD_COLLECTDCLIENT_H 1 -#include "lcc_features.h" -#include "types.h" +#include "collectd/lcc_features.h" +#include "collectd/types.h" /* COLLECTD_TRACE is the environment variable used to control trace output. When * set to something non-zero, all lines sent to / received from the daemon are diff --git a/src/libcollectdclient/collectd/network.h b/src/libcollectdclient/collectd/network.h index 35fd7d62..c8a5da54 100644 --- a/src/libcollectdclient/collectd/network.h +++ b/src/libcollectdclient/collectd/network.h @@ -27,11 +27,11 @@ #ifndef LIBCOLLECTDCLIENT_NETWORK_H #define LIBCOLLECTDCLIENT_NETWORK_H 1 +#include "collectd/client.h" + #include #include -#include "client.h" - #define NET_DEFAULT_V4_ADDR "239.192.74.66" #define NET_DEFAULT_V6_ADDR "ff18::efc0:4a42" #define NET_DEFAULT_PORT "25826" diff --git a/src/libcollectdclient/collectd/network_buffer.h b/src/libcollectdclient/collectd/network_buffer.h index 9f393103..58cc3c59 100644 --- a/src/libcollectdclient/collectd/network_buffer.h +++ b/src/libcollectdclient/collectd/network_buffer.h @@ -28,8 +28,8 @@ #define LIBCOLLECTDCLIENT_NETWORK_BUFFER_H 1 /* FIXME */ -#include "client.h" -#include "network.h" +#include "collectd/client.h" +#include "collectd/network.h" /* Ethernet frame - (IPv6 header + UDP header) */ #define LCC_NETWORK_BUFFER_SIZE_DEFAULT 1452 diff --git a/src/libcollectdclient/collectd/types.h b/src/libcollectdclient/collectd/types.h index d2e37646..445fef31 100644 --- a/src/libcollectdclient/collectd/types.h +++ b/src/libcollectdclient/collectd/types.h @@ -27,7 +27,7 @@ #ifndef LIBCOLLECTD_COLLECTD_TYPES_H #define LIBCOLLECTD_COLLECTD_TYPES_H 1 -#include "lcc_features.h" +#include "collectd/lcc_features.h" #include /* for uint64_t */ #include /* for size_t */ -- 2.30.2