From: Florian Forster <octo@collectd.org>
Date: Sat, 20 Sep 2014 05:18:03 +0000 (+0200)
Subject: Move utils_parse_option.[ch] out of the daemon/ directory.
X-Git-Tag: collectd-5.5.0~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14c9c9b36b05ff79b59e1bcdb62a30417ca913e5;p=thirdparty%2Fcollectd.git

Move utils_parse_option.[ch] out of the daemon/ directory.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index b3bd26ed6..16f458e14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -333,7 +333,8 @@ if BUILD_PLUGIN_EXEC
 pkglib_LTLIBRARIES += exec.la
 exec_la_SOURCES = exec.c \
 		  utils_cmd_putnotif.c utils_cmd_putnotif.h \
-		  utils_cmd_putval.c utils_cmd_putval.h
+		  utils_cmd_putval.c utils_cmd_putval.h \
+		  utils_parse_option.h utils_parse_option.c
 exec_la_LDFLAGS = -module -avoid-version
 exec_la_LIBADD = -lpthread
 endif
@@ -1042,7 +1043,8 @@ unixsock_la_SOURCES = unixsock.c \
 		      utils_cmd_getthreshold.h utils_cmd_getthreshold.c \
 		      utils_cmd_listval.h utils_cmd_listval.c \
 		      utils_cmd_putval.h utils_cmd_putval.c \
-		      utils_cmd_putnotif.h utils_cmd_putnotif.c
+		      utils_cmd_putnotif.h utils_cmd_putnotif.c \
+		      utils_parse_option.h utils_parse_option.c
 unixsock_la_LDFLAGS = -module -avoid-version
 unixsock_la_LIBADD = -lpthread
 endif
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index c40107791..d6067d7ba 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -27,7 +27,6 @@ collectd_SOURCES = collectd.c collectd.h \
 		   utils_complain.c utils_complain.h \
 		   utils_heap.c utils_heap.h \
 		   utils_llist.c utils_llist.h \
-		   utils_parse_option.c utils_parse_option.h \
 		   utils_random.c utils_random.h \
 		   utils_tail_match.c utils_tail_match.h \
 		   utils_match.c utils_match.h \
diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index 678a341c1..7fa621bfa 100644
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -23,7 +23,6 @@
 #include "plugin.h"
 #include "common.h"
 #include "utils_cache.h"
-#include "utils_parse_option.h"
 
 #include <tcrdb.h>
 
diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c
index b7d4494d3..220258f40 100644
--- a/src/utils_format_graphite.c
+++ b/src/utils_format_graphite.c
@@ -27,7 +27,6 @@
 
 #include "utils_format_graphite.h"
 #include "utils_cache.h"
-#include "utils_parse_option.h"
 
 #define GRAPHITE_FORBIDDEN " \t\"\\:!/()\n\r"
 
diff --git a/src/daemon/utils_parse_option.c b/src/utils_parse_option.c
similarity index 100%
rename from src/daemon/utils_parse_option.c
rename to src/utils_parse_option.c
diff --git a/src/daemon/utils_parse_option.h b/src/utils_parse_option.h
similarity index 100%
rename from src/daemon/utils_parse_option.h
rename to src/utils_parse_option.h
diff --git a/src/write_graphite.c b/src/write_graphite.c
index 5c7bbd553..d3d520279 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -49,7 +49,6 @@
 
 #include "utils_cache.h"
 #include "utils_complain.h"
-#include "utils_parse_option.h"
 #include "utils_format_graphite.h"
 
 /* Folks without pthread will need to disable this plugin. */