- move Locker class to proxy library

diff --git a/client/Makefile.am b/client/Makefile.am
index 85de987f2a57745bfbc9f201d890e6707abecd45..5166702f3344b954fd837b2b7b6cd933793c47a7 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -31,7 +31,6 @@ snapper_SOURCES =                                     \
        cmd-cleanup.cc                                  \
        cmd-debug.cc                                    \
        cleanup.cc              cleanup.h               \
-       locker.cc               locker.h                \
        misc.cc                 misc.h                  \
        MyFiles.cc              MyFiles.h               \
        GlobalOptions.cc        GlobalOptions.h
@@ -51,7 +50,6 @@ libexec_PROGRAMS = systemd-helper
 systemd_helper_SOURCES =               \
        systemd-helper.cc               \
        cleanup.cc      cleanup.h       \
-       locker.cc       locker.h        \
        misc.cc         misc.h
 
 systemd_helper_LDADD =                         \

diff --git a/client/cleanup.cc b/client/cleanup.cc
index 1842e33c37b6b272761d1c1bac06794e2e7c0941..33151fd11655ebe7961443dfa2147245a8ef02db 100644 (file)
--- a/client/cleanup.cc
+++ b/client/cleanup.cc
@@ -33,8 +33,8 @@
 #include "utils/Limit.h"
 #include "utils/equal-date.h"
 #include "utils/HumanString.h"
+#include "proxy/locker.h"
 #include "cleanup.h"
-#include "locker.h"
 
 
 using namespace std;

diff --git a/client/cmd-list.cc b/client/cmd-list.cc
index 550ca3a4ba932a97d937da2a67dca61bd5a2795c..70805bd8469e42bc32af3564a95fec8970c6dcc1 100644 (file)
--- a/client/cmd-list.cc
+++ b/client/cmd-list.cc
@@ -32,8 +32,8 @@
 #include "utils/text.h"
 #include "utils/help.h"
 #include "proxy/proxy.h"
+#include "proxy/locker.h"
 #include "GlobalOptions.h"
-#include "locker.h"
 #include "misc.h"
 #include "utils/TableFormatter.h"
 #include "utils/CsvFormatter.h"

diff --git a/client/proxy/.gitignore b/client/proxy/.gitignore
new file mode 100644 (file)
index 0000000..66a3f3f
--- /dev/null
+++ b/client/proxy/.gitignore
@@ -0,0 +1,2 @@
+*.lo
+*.la

diff --git a/client/proxy/Makefile.am b/client/proxy/Makefile.am
index 785b09dee7dde651c15d5bd6d5448cee3912ba5e..2a6e8bfd6b23f3fad3a62855a9657c83be17688a 100644 (file)
--- a/client/proxy/Makefile.am
+++ b/client/proxy/Makefile.am
@@ -18,4 +18,5 @@ libclient_la_LIBADD =                         \
 libproxy_la_SOURCES =                  \
        proxy.cc        proxy.h         \
        proxy-dbus.cc   proxy-dbus.h    \
-       proxy-lib.cc    proxy-lib.h
+       proxy-lib.cc    proxy-lib.h     \
+       locker.cc       locker.h

diff --git a/client/locker.cc b/client/proxy/locker.cc
similarity index 100%
rename from client/locker.cc
rename to client/proxy/locker.cc

diff --git a/client/locker.h b/client/proxy/locker.h
similarity index 97%
rename from client/locker.h
rename to client/proxy/locker.h
index 9d53516eeb465482b287f52aaa7b45fa9bf0d3c0..41d30ae1670d8eec173ac647311d5814c6c17ead 100644 (file)
--- a/client/locker.h
+++ b/client/proxy/locker.h
@@ -20,7 +20,7 @@
  */
 
 
-#include "proxy/proxy.h"
+#include "proxy.h"
 
 
 namespace snapper