From dc433b9c8b4187faee94d972b333a91b22eaf9e0 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 18 Aug 2014 20:31:00 -0700 Subject: [PATCH] Moved backends from src/backend/ to src/plugins/backend/. --- src/Makefile.am | 30 +++++++++---------- src/{ => plugins}/backend/collectd/unixsock.c | 2 +- src/{ => plugins}/backend/mk-livestatus.c | 2 +- .../backend/puppet/store-configs.c | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) rename src/{ => plugins}/backend/collectd/unixsock.c (99%) rename src/{ => plugins}/backend/mk-livestatus.c (99%) rename src/{ => plugins}/backend/puppet/store-configs.c (99%) diff --git a/src/Makefile.am b/src/Makefile.am index faea551..97c3188 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -159,27 +159,27 @@ sysdbd_DEPENDENCIES += plugins/cname/dns.la endif if BUILD_PLUGIN_COLLECTD -pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la -backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c -backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -sysdbd_LDADD += -dlopen backend/collectd/unixsock.la -sysdbd_DEPENDENCIES += backend/collectd/unixsock.la +pkgbackendcollectdlib_LTLIBRARIES += plugins/backend/collectd/unixsock.la +plugins_backend_collectd_unixsock_la_SOURCES = plugins/backend/collectd/unixsock.c +plugins_backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version +sysdbd_LDADD += -dlopen plugins/backend/collectd/unixsock.la +sysdbd_DEPENDENCIES += plugins/backend/collectd/unixsock.la endif if BUILD_PLUGIN_MKLIVESTATUS -pkgbackendlib_LTLIBRARIES += backend/mk-livestatus.la -backend_mk_livestatus_la_SOURCES = backend/mk-livestatus.c -backend_mk_livestatus_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -sysdbd_LDADD += -dlopen backend/mk-livestatus.la -sysdbd_DEPENDENCIES += backend/mk-livestatus.la +pkgbackendlib_LTLIBRARIES += plugins/backend/mk-livestatus.la +plugins_backend_mk_livestatus_la_SOURCES = plugins/backend/mk-livestatus.c +plugins_backend_mk_livestatus_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version +sysdbd_LDADD += -dlopen plugins/backend/mk-livestatus.la +sysdbd_DEPENDENCIES += plugins/backend/mk-livestatus.la endif if BUILD_PLUGIN_PUPPETSTORECONFIGS -pkgbackendpuppetlib_LTLIBRARIES += backend/puppet/store-configs.la -backend_puppet_store_configs_la_SOURCES = backend/puppet/store-configs.c -backend_puppet_store_configs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -sysdbd_LDADD += -dlopen backend/puppet/store-configs.la -sysdbd_DEPENDENCIES += backend/puppet/store-configs.la +pkgbackendpuppetlib_LTLIBRARIES += plugins/backend/puppet/store-configs.la +plugins_backend_puppet_store_configs_la_SOURCES = plugins/backend/puppet/store-configs.c +plugins_backend_puppet_store_configs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version +sysdbd_LDADD += -dlopen plugins/backend/puppet/store-configs.la +sysdbd_DEPENDENCIES += plugins/backend/puppet/store-configs.la endif if BUILD_PLUGIN_SYSLOG diff --git a/src/backend/collectd/unixsock.c b/src/plugins/backend/collectd/unixsock.c similarity index 99% rename from src/backend/collectd/unixsock.c rename to src/plugins/backend/collectd/unixsock.c index c0d023e..29d7802 100644 --- a/src/backend/collectd/unixsock.c +++ b/src/plugins/backend/collectd/unixsock.c @@ -1,5 +1,5 @@ /* - * SysDB - src/backend/collectd/unixsock.c + * SysDB - src/plugins/backend/collectd/unixsock.c * Copyright (C) 2012 Sebastian 'tokkee' Harl * All rights reserved. * diff --git a/src/backend/mk-livestatus.c b/src/plugins/backend/mk-livestatus.c similarity index 99% rename from src/backend/mk-livestatus.c rename to src/plugins/backend/mk-livestatus.c index 0f94ce3..599758b 100644 --- a/src/backend/mk-livestatus.c +++ b/src/plugins/backend/mk-livestatus.c @@ -1,5 +1,5 @@ /* - * SysDB - src/backend/mk-livestatus.c + * SysDB - src/plugins/backend/mk-livestatus.c * Copyright (C) 2012 Sebastian 'tokkee' Harl * All rights reserved. * diff --git a/src/backend/puppet/store-configs.c b/src/plugins/backend/puppet/store-configs.c similarity index 99% rename from src/backend/puppet/store-configs.c rename to src/plugins/backend/puppet/store-configs.c index 5efc531..95dd549 100644 --- a/src/backend/puppet/store-configs.c +++ b/src/plugins/backend/puppet/store-configs.c @@ -1,5 +1,5 @@ /* - * SysDB - src/backend/puppet/store-configs.c + * SysDB - src/plugins/backend/puppet/store-configs.c * Copyright (C) 2012 Sebastian 'tokkee' Harl * All rights reserved. * -- 2.30.2