- move installation-helper and systemd-helper to own directory

diff --git a/client/.gitignore b/client/.gitignore
index 3dbf75bb5a54d14d7b59b41eae6b495424963f0e..1c40c41830bdf1eea8837e69a0149ae25bdc2c5f 100644 (file)
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -2,5 +2,3 @@
 *.lo
 *.la
 snapper
-systemd-helper
-installation-helper

diff --git a/client/Makefile.am b/client/Makefile.am
index be47fe295294dc44299d7771be08e390711900db..f0bc8394c9daec6c6cf7825afb9daca06de2ede7 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/client
 #
 
-SUBDIRS = utils proxy mksubvolume
+SUBDIRS = utils proxy mksubvolume installation-helper systemd-helper
 
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
@@ -42,31 +42,3 @@ snapper_LDADD =                      \
        utils/libutils.la               \
        ../dbus/libdbus.la              \
        $(JSON_C_LIBS)
-
-libexecdir = /usr/lib/snapper
-
-libexec_PROGRAMS = systemd-helper
-
-systemd_helper_SOURCES =               \
-       systemd-helper.cc               \
-       cleanup.cc      cleanup.h       \
-       misc.cc         misc.h
-
-systemd_helper_LDADD =                         \
-       proxy/libproxy.la               \
-       proxy/libclient.la              \
-       ../snapper/libsnapper.la        \
-       utils/libutils.la               \
-       ../dbus/libdbus.la
-
-if ENABLE_BTRFS
-
-libexec_PROGRAMS += installation-helper
-
-installation_helper_SOURCES =          \
-       installation-helper.cc          \
-       misc.cc         misc.h
-
-installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la
-
-endif

diff --git a/client/installation-helper/.gitignore b/client/installation-helper/.gitignore
new file mode 100644 (file)
index 0000000..6a9e767
--- /dev/null
+++ b/client/installation-helper/.gitignore
@@ -0,0 +1,4 @@
+*.o
+*.lo
+*.la
+installation-helper

diff --git a/client/installation-helper/Makefile.am b/client/installation-helper/Makefile.am
new file mode 100644 (file)
index 0000000..bc50f1e
--- /dev/null
+++ b/client/installation-helper/Makefile.am
@@ -0,0 +1,21 @@
+#
+# Makefile.am for snapper/client/installation-helper
+#
+
+AM_CPPFLAGS = -I$(top_srcdir)
+
+libexecdir = /usr/lib/snapper
+
+if ENABLE_BTRFS
+
+libexec_PROGRAMS = installation-helper
+
+installation_helper_SOURCES =          \
+       installation-helper.cc          \
+       ../misc.cc      ../misc.h
+
+installation_helper_LDADD =            \
+       ../../snapper/libsnapper.la     \
+       ../utils/libutils.la
+
+endif

diff --git a/client/installation-helper.cc b/client/installation-helper/installation-helper.cc
similarity index 99%
rename from client/installation-helper.cc
rename to client/installation-helper/installation-helper.cc
index 1fdba8c5b6d45240f59537a2355a79a070cb569d..5ff13f9dba3428d14c03ff997fb3d2a3da8ad1b1 100644 (file)
--- a/client/installation-helper.cc
+++ b/client/installation-helper/installation-helper.cc
@@ -38,9 +38,9 @@
 #include <snapper/PluginsImpl.h>
 #include "snapper/Log.h"
 
-#include "utils/GetOpts.h"
+#include "../utils/GetOpts.h"
 
-#include "misc.h"
+#include "../misc.h"
 
 
 using namespace snapper;

diff --git a/client/systemd-helper/.gitignore b/client/systemd-helper/.gitignore
new file mode 100644 (file)
index 0000000..c8c7585
--- /dev/null
+++ b/client/systemd-helper/.gitignore
@@ -0,0 +1,4 @@
+*.o
+*.lo
+*.la
+systemd-helper

diff --git a/client/systemd-helper/Makefile.am b/client/systemd-helper/Makefile.am
new file mode 100644 (file)
index 0000000..cc70384
--- /dev/null
+++ b/client/systemd-helper/Makefile.am
@@ -0,0 +1,21 @@
+#
+# Makefile.am for snapper/client/systemd-helper
+#
+
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+libexecdir = /usr/lib/snapper
+
+libexec_PROGRAMS = systemd-helper
+
+systemd_helper_SOURCES =               \
+       systemd-helper.cc               \
+       ../cleanup.cc   ../cleanup.h    \
+       ../misc.cc      ../misc.h
+
+systemd_helper_LDADD =                         \
+       ../proxy/libproxy.la            \
+       ../proxy/libclient.la           \
+       ../../snapper/libsnapper.la     \
+       ../utils/libutils.la            \
+       ../../dbus/libdbus.la

diff --git a/client/systemd-helper.cc b/client/systemd-helper/systemd-helper.cc
similarity index 97%
rename from client/systemd-helper.cc
rename to client/systemd-helper/systemd-helper.cc
index 2801c5ad6ad2241619e64fd5be27fa196aabd785..557ce842cdef78f50a36287fd7693be740586442 100644 (file)
--- a/client/systemd-helper.cc
+++ b/client/systemd-helper/systemd-helper.cc
@@ -29,13 +29,13 @@
 #include <snapper/SystemCmd.h>
 #include <snapper/SnapperDefines.h>
 
-#include "utils/text.h"
-#include "utils/GetOpts.h"
-#include "proxy/proxy.h"
-#include "proxy/errors.h"
+#include "../utils/text.h"
+#include "../utils/GetOpts.h"
+#include "../proxy/proxy.h"
+#include "../proxy/errors.h"
 
-#include "cleanup.h"
-#include "misc.h"
+#include "../cleanup.h"
+#include "../misc.h"
 
 
 using namespace snapper;

diff --git a/configure.ac b/configure.ac
index a59a9990d0d9c9a7aa89146a761b67ac8575f21d..fc2804ddcabfb5e979721ba358ee7402cbd8b227 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,8 @@ AC_CONFIG_FILES([
        client/utils/Makefile
        client/proxy/Makefile
        client/mksubvolume/Makefile
+       client/installation-helper/Makefile
+       client/systemd-helper/Makefile
        scripts/Makefile
        pam/Makefile
        data/Makefile