libcollectdclient: Include headers with the "collectd/" path prefix.

diff --git a/Makefile.am b/Makefile.am
index c03347235e6a72437b73acae88a8f9e28af2bd8c..f8d911da8d651ce8a8a716365bc1ff672626229d 100644 (file)
--- 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 993541d8af9b32545a60c7bfab7ce11829cc4505..e106bb888caec83f16a44507a4e5f8ae919eb8af 100644 (file)
--- 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 3bde325913c644bd4b48abef02ea89344aef8dad..a0fe2840c72f7e534f7a4dce4835ba48206477f6 100644 (file)
--- 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 248baadfb00c196463c63adf21aeb857df74f4b2..35e948e9fd0319b4c4121deae6710133ce77f776 100644 (file)
--- 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 d385e908ae45d22f290aa86fc7ec7f41ab88cee3..fd4899fc06551b09983b912d9814903aa46546e1 100644 (file)
--- 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 35fd7d62b54cbf3d9c34ca375ddd2e3b301c23aa..c8a5da54ed75edbdd8d5d45c3e463a4b520cc2eb 100644 (file)
--- 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 <inttypes.h>
 #include <stdint.h>
 
-#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 9f39310331bcc9fc66ef1cbacd7b6f25b4d0fff4..58cc3c5940b9fd7267c0ae46aa7bed0d8b896237 100644 (file)
--- 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 d2e37646a2bbe06b6e27caf4bafe67f22ec440c6..445fef31fff050705d07077bb51dcd7cc6d749ff 100644 (file)
--- 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 <stdint.h>    /* for uint64_t */
 #include <sys/types.h> /* for size_t */