From 88a030db20ff8dfa161fa10dd1d7fb1cf3f18bda Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 29 Nov 2016 15:43:22 +0100
Subject: [PATCH] Fix make distcheck

This was broken by 1d888f3
---
 src/Makefile.am                     | 9 +++++----
 src/daemon/Makefile.am              | 7 +------
 src/{daemon => }/utils_match.c      | 0
 src/{daemon => }/utils_match.h      | 0
 src/{daemon => }/utils_tail.c       | 0
 src/{daemon => }/utils_tail.h       | 0
 src/{daemon => }/utils_tail_match.c | 0
 src/{daemon => }/utils_tail_match.h | 0
 8 files changed, 6 insertions(+), 10 deletions(-)
 rename src/{daemon => }/utils_match.c (100%)
 rename src/{daemon => }/utils_match.h (100%)
 rename src/{daemon => }/utils_tail.c (100%)
 rename src/{daemon => }/utils_tail.h (100%)
 rename src/{daemon => }/utils_tail_match.c (100%)
 rename src/{daemon => }/utils_tail_match.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index a01176d9..37763894 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -334,7 +334,8 @@ endif
 if BUILD_PLUGIN_CURL
 pkglib_LTLIBRARIES += curl.la
 curl_la_SOURCES = curl.c \
-		  utils_curl_stats.c utils_curl_stats.h
+		  utils_curl_stats.c utils_curl_stats.h \
+		  utils_match.c utils_match.h
 curl_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
@@ -686,7 +687,7 @@ endif
 
 if BUILD_PLUGIN_MEMCACHEC
 pkglib_LTLIBRARIES += memcachec.la
-memcachec_la_SOURCES = memcachec.c
+memcachec_la_SOURCES = memcachec.c utils_match.c utils_match.h
 memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS)
 memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS)
 memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS)
@@ -1114,14 +1115,14 @@ endif
 
 if BUILD_PLUGIN_TAIL
 pkglib_LTLIBRARIES += tail.la
-tail_la_SOURCES = tail.c
+tail_la_SOURCES = tail.c utils_tail_match.c utils_tail_match.h
 tail_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 tail_la_LIBADD = liblatency.la
 endif
 
 if BUILD_PLUGIN_TAIL_CSV
 pkglib_LTLIBRARIES += tail_csv.la
-tail_csv_la_SOURCES = tail_csv.c
+tail_csv_la_SOURCES = tail_csv.c utils_tail.c utils_tail.h
 tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 endif
 
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index ac8c7640..52079438 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -61,15 +61,10 @@ collectd_SOURCES = collectd.c collectd.h \
 		   utils_ignorelist.c utils_ignorelist.h \
 		   utils_llist.c utils_llist.h \
 		   utils_random.c utils_random.h \
-		   utils_tail_match.c utils_tail_match.h \
-		   utils_match.c utils_match.h \
 		   utils_subst.c utils_subst.h \
-		   utils_tail.c utils_tail.h \
 		   utils_time.c utils_time.h \
 		   types_list.c types_list.h \
-		   utils_threshold.c utils_threshold.h \
-		   ../utils_latency_config.h ../utils_latency_config.c \
-		   ../utils_latency.h ../utils_latency.c
+		   utils_threshold.c utils_threshold.h
 
 
 collectd_CPPFLAGS =  $(AM_CPPFLAGS) $(LTDLINCL)
diff --git a/src/daemon/utils_match.c b/src/utils_match.c
similarity index 100%
rename from src/daemon/utils_match.c
rename to src/utils_match.c
diff --git a/src/daemon/utils_match.h b/src/utils_match.h
similarity index 100%
rename from src/daemon/utils_match.h
rename to src/utils_match.h
diff --git a/src/daemon/utils_tail.c b/src/utils_tail.c
similarity index 100%
rename from src/daemon/utils_tail.c
rename to src/utils_tail.c
diff --git a/src/daemon/utils_tail.h b/src/utils_tail.h
similarity index 100%
rename from src/daemon/utils_tail.h
rename to src/utils_tail.h
diff --git a/src/daemon/utils_tail_match.c b/src/utils_tail_match.c
similarity index 100%
rename from src/daemon/utils_tail_match.c
rename to src/utils_tail_match.c
diff --git a/src/daemon/utils_tail_match.h b/src/utils_tail_match.h
similarity index 100%
rename from src/daemon/utils_tail_match.h
rename to src/utils_tail_match.h
-- 
2.11.0