- moved proxy library to subdirectory

diff --git a/client/Makefile.am b/client/Makefile.am
index 7e0598c3049a0af35a577d2bc034a27d83cf0c1f..85de987f2a57745bfbc9f201d890e6707abecd45 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -2,26 +2,10 @@
 # Makefile.am for snapper/client
 #
 
-SUBDIRS = utils
+SUBDIRS = utils proxy
 
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
-noinst_LTLIBRARIES = libclient.la libproxy.la
-
-libclient_la_SOURCES =                 \
-       types.cc        types.h         \
-       commands.cc     commands.h      \
-       errors.cc       errors.h
-
-libclient_la_LIBADD =                  \
-       utils/libutils.la               \
-       ../dbus/libdbus.la
-
-libproxy_la_SOURCES =                  \
-       proxy.cc        proxy.h         \
-       proxy-dbus.cc   proxy-dbus.h    \
-       proxy-lib.cc    proxy-lib.h
-
 bin_PROGRAMS = snapper
 
 snapper_SOURCES =                                      \
@@ -53,8 +37,8 @@ snapper_SOURCES =                                     \
        GlobalOptions.cc        GlobalOptions.h
 
 snapper_LDADD =                        \
-       libproxy.la                     \
-       libclient.la                    \
+       proxy/libproxy.la               \
+       proxy/libclient.la              \
        ../snapper/libsnapper.la        \
        utils/libutils.la               \
        ../dbus/libdbus.la              \
@@ -71,8 +55,8 @@ systemd_helper_SOURCES =              \
        misc.cc         misc.h
 
 systemd_helper_LDADD =                         \
-       libproxy.la                     \
-       libclient.la                    \
+       proxy/libproxy.la               \
+       proxy/libclient.la              \
        ../snapper/libsnapper.la        \
        utils/libutils.la               \
        ../dbus/libdbus.la

diff --git a/client/MyFiles.cc b/client/MyFiles.cc
index 9fc8d3752194f843dce5de5b4384c58f89829ae4..48b5fe2b0afb8ee2bc53bed77f06bfe22063a253 100644 (file)
--- a/client/MyFiles.cc
+++ b/client/MyFiles.cc
@@ -23,7 +23,7 @@
 
 #include <iostream>
 
-#include "proxy.h"
+#include "proxy/proxy.h"
 #include "utils/text.h"
 #include "GlobalOptions.h"
 

diff --git a/client/cleanup.h b/client/cleanup.h
index aceaab803b5d590b0f4163447e4e4ee0414eca89..764d85159c4bc6fb26cd41ce71ac6060db001a9c 100644 (file)
--- a/client/cleanup.h
+++ b/client/cleanup.h
@@ -23,7 +23,7 @@
 
 #include <functional>
 
-#include "proxy.h"
+#include "proxy/proxy.h"
 
 
 /*

diff --git a/client/cmd-cleanup.cc b/client/cmd-cleanup.cc
index f00d16e8e3a64c05ce409081a6ccb949e4805d53..d07a91faaa0949318fd4647f41de8e7c07cf2b7a 100644 (file)
--- a/client/cmd-cleanup.cc
+++ b/client/cmd-cleanup.cc
@@ -35,8 +35,8 @@
 #include "utils/HumanString.h"
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "cleanup.h"
 #include "misc.h"
 #include "cmd.h"

diff --git a/client/cmd-create-config.cc b/client/cmd-create-config.cc
index c1e700841c844f8b170801e83b2128c83b943e7a..0d0707d42163ff8c70e4ea7a883f8cba060a73d8 100644 (file)
--- a/client/cmd-create-config.cc
+++ b/client/cmd-create-config.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-create.cc b/client/cmd-create.cc
index aebc1770f73e7f0c95b08410c48bb0639e219b04..026ac8cfce63bf1c18f5c737a51c1ee122060100 100644 (file)
--- a/client/cmd-create.cc
+++ b/client/cmd-create.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 
 

diff --git a/client/cmd-debug.cc b/client/cmd-debug.cc
index 18a7bbdb641b8a47916382923f0b68ce6e39cd8b..36da6d2cea786d0abd894489f3c2327596ce4691 100644 (file)
--- a/client/cmd-debug.cc
+++ b/client/cmd-debug.cc
@@ -24,8 +24,8 @@
 #include <iostream>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-delete-config.cc b/client/cmd-delete-config.cc
index 930e63bf6ff6e8f0bd94e029dd99bbaedcc1bed3..ff11e02ef053c9b6c88aec1590fc72e044a2d090 100644 (file)
--- a/client/cmd-delete-config.cc
+++ b/client/cmd-delete-config.cc
@@ -24,8 +24,8 @@
 #include <iostream>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-delete.cc b/client/cmd-delete.cc
index 5288512c5b30f80495a07977f4616ca56a0700f9..2eda1c5214d224d3285f12faf5c9518c3db14d1c 100644 (file)
--- a/client/cmd-delete.cc
+++ b/client/cmd-delete.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-diff.cc b/client/cmd-diff.cc
index dd80dd1937578e37ceb76c030c5fca553f24b67d..d24c3dd0a0c11523ea33709d934900de6a5481d1 100644 (file)
--- a/client/cmd-diff.cc
+++ b/client/cmd-diff.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 #include "MyFiles.h"
 

diff --git a/client/cmd-get-config.cc b/client/cmd-get-config.cc
index 19fe2ff3dcdb7390d6aa7834122841b3c70756bb..0d8b4f83ec56dc7e0186e868b6503ad57364e589 100644 (file)
--- a/client/cmd-get-config.cc
+++ b/client/cmd-get-config.cc
@@ -25,8 +25,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 #include "utils/TableFormatter.h"
 #include "utils/CsvFormatter.h"

diff --git a/client/cmd-list-configs.cc b/client/cmd-list-configs.cc
index 4cfde2b668a630ae4dc0a5304922c38676dc87d7..274cbf29abd1b64c0fe7cbe3796a3d3704b95e37 100644 (file)
--- a/client/cmd-list-configs.cc
+++ b/client/cmd-list-configs.cc
@@ -25,8 +25,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 #include "utils/TableFormatter.h"
 #include "utils/CsvFormatter.h"

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

diff --git a/client/cmd-modify.cc b/client/cmd-modify.cc
index 0671259eba90b860cb9bd545e82f2dda36a10953..90c378c9621edba08bb3c904d3d296270123328b 100644 (file)
--- a/client/cmd-modify.cc
+++ b/client/cmd-modify.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 
 

diff --git a/client/cmd-mount.cc b/client/cmd-mount.cc
index a73871f33f34e4893951a584ce083a6c33cf062e..dcc0fd1e7fb04441ad58d2ec1ed18a38f3745bf7 100644 (file)
--- a/client/cmd-mount.cc
+++ b/client/cmd-mount.cc
@@ -24,8 +24,8 @@
 #include <iostream>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-rollback.cc b/client/cmd-rollback.cc
index 3075d5037a023419f915783f47473a4824b9cf31..a4748db1659d22b67fad6d25a70c37bfdefc9ac0 100644 (file)
--- a/client/cmd-rollback.cc
+++ b/client/cmd-rollback.cc
@@ -31,8 +31,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 
 

diff --git a/client/cmd-set-config.cc b/client/cmd-set-config.cc
index d1618e6b4c2973d3476554e222a58bf8f7bac0be..234907ec1e546d34191ce8ebc81ecc7b5e4a76c2 100644 (file)
--- a/client/cmd-set-config.cc
+++ b/client/cmd-set-config.cc
@@ -24,8 +24,8 @@
 #include <iostream>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "misc.h"
 
 

diff --git a/client/cmd-setup-quota.cc b/client/cmd-setup-quota.cc
index e1540085969d88ef56b4fc0533771fd841399e8f..15461922fafd649106f2a8d262382733ff655e69 100644 (file)
--- a/client/cmd-setup-quota.cc
+++ b/client/cmd-setup-quota.cc
@@ -24,8 +24,8 @@
 #include <iostream>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-status.cc b/client/cmd-status.cc
index d0cd6d8fe90487e7ed543089f01945d7113a351f..be4235721e14d8f8d296b867142ee54ff382b785 100644 (file)
--- a/client/cmd-status.cc
+++ b/client/cmd-status.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "MyFiles.h"
 
 

diff --git a/client/cmd-umount.cc b/client/cmd-umount.cc
index 200d32e0f1650f5f6ca4c2c5d6fea60246a71211..067af6ae301282a3e4961decfd94a65dd4789181 100644 (file)
--- a/client/cmd-umount.cc
+++ b/client/cmd-umount.cc
@@ -24,8 +24,8 @@
 #include <iostream>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 
 
 namespace snapper

diff --git a/client/cmd-undochange.cc b/client/cmd-undochange.cc
index dee27e3b165d69b2d505ddc50304dd39aa2b9d5f..a0726ca510d5f4f6eec6a8dd0b0dd0349ac1eb0c 100644 (file)
--- a/client/cmd-undochange.cc
+++ b/client/cmd-undochange.cc
@@ -27,8 +27,8 @@
 
 #include "utils/text.h"
 #include "utils/help.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "MyFiles.h"
 
 

diff --git a/client/cmd-xadiff.cc b/client/cmd-xadiff.cc
index 770480bba67a8b775bc200644491600eb64c283d..15aa26dfeff713d7fe4d23bd2095988b0180f565 100644 (file)
--- a/client/cmd-xadiff.cc
+++ b/client/cmd-xadiff.cc
@@ -28,8 +28,8 @@
 #include <snapper/XAttributes.h>
 
 #include "utils/text.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "proxy.h"
 #include "MyFiles.h"
 
 

diff --git a/client/cmd.h b/client/cmd.h
index 37ede8c6e0725e3c881c6912ca24999daf546ab4..44c7d14ddbe657fdbd82a883bf6b9bf5689b3ee1 100644 (file)
--- a/client/cmd.h
+++ b/client/cmd.h
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "proxy.h"
+#include "proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

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

diff --git a/client/misc.h b/client/misc.h
index c4ade1b274aea4843e49cc3e281a09e6c61c7d8a..a87d7603345223165e48eb2078c775d878b9c141 100644 (file)
--- a/client/misc.h
+++ b/client/misc.h
@@ -30,7 +30,7 @@
 
 #include "client/utils/text.h"
 #include "client/utils/GetOpts.h"
-#include "proxy.h"
+#include "proxy/proxy.h"
 
 
 using namespace snapper;

diff --git a/client/proxy/Makefile.am b/client/proxy/Makefile.am
new file mode 100644 (file)
index 0000000..785b09d
--- /dev/null
+++ b/client/proxy/Makefile.am
@@ -0,0 +1,21 @@
+#
+# Makefile.am for snapper/client/proxy
+#
+
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+noinst_LTLIBRARIES = libclient.la libproxy.la
+
+libclient_la_SOURCES =                 \
+       types.cc        types.h         \
+       commands.cc     commands.h      \
+       errors.cc       errors.h
+
+libclient_la_LIBADD =                  \
+       ../utils/libutils.la            \
+       ../../dbus/libdbus.la
+
+libproxy_la_SOURCES =                  \
+       proxy.cc        proxy.h         \
+       proxy-dbus.cc   proxy-dbus.h    \
+       proxy-lib.cc    proxy-lib.h

diff --git a/client/commands.cc b/client/proxy/commands.cc
similarity index 99%
rename from client/commands.cc
rename to client/proxy/commands.cc
index d467371022ce9db3934224bf57e40f1aa250b983..3aece4aca138c76daf0e3cd555c6e41e591d77c8 100644 (file)
--- a/client/commands.cc
+++ b/client/proxy/commands.cc
@@ -26,7 +26,7 @@
 
 #include "commands.h"
 #include "errors.h"
-#include "utils/text.h"
+#include "../utils/text.h"
 #include "dbus/DBusPipe.h"
 #include "snapper/AppUtil.h"
 

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

diff --git a/client/errors.cc b/client/proxy/errors.cc
similarity index 99%
rename from client/errors.cc
rename to client/proxy/errors.cc
index 12f7af93ae1ec1807e6a2cf5e715b10d1eefcf53..c9c81f7e0bdc29f13d9e4d774fd579702037e0f7 100644 (file)
--- a/client/errors.cc
+++ b/client/proxy/errors.cc
@@ -24,7 +24,7 @@
 #include <snapper/AppUtil.h>
 #include <snapper/Snapper.h>
 
-#include "utils/text.h"
+#include "../utils/text.h"
 
 #include "errors.h"
 

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

diff --git a/client/proxy-dbus.cc b/client/proxy/proxy-dbus.cc
similarity index 99%
rename from client/proxy-dbus.cc
rename to client/proxy/proxy-dbus.cc
index 7d998d5aa63919e6d6f32ebc6b6003d06338531e..2722f78d269ff43f972a0f853021fd671ee27c65 100644 (file)
--- a/client/proxy-dbus.cc
+++ b/client/proxy/proxy-dbus.cc
@@ -22,7 +22,7 @@
 
 #include "proxy-dbus.h"
 #include "commands.h"
-#include "utils/text.h"
+#include "../utils/text.h"
 
 
 using namespace std;

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

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

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

diff --git a/client/proxy.cc b/client/proxy/proxy.cc
similarity index 99%
rename from client/proxy.cc
rename to client/proxy/proxy.cc
index c70eb359031b146c4998c9c8886c3acbf0c53153..08a6a5e62d9a36996cc91516ee8d8bfde1ac3f94 100644 (file)
--- a/client/proxy.cc
+++ b/client/proxy/proxy.cc
@@ -27,7 +27,7 @@
 #include <snapper/AppUtil.h>
 #include <snapper/SnapperDefines.h>
 
-#include "utils/text.h"
+#include "../utils/text.h"
 #include "proxy.h"
 
 

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

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

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

diff --git a/client/snapper.cc b/client/snapper.cc
index c8d4c342490e8489f724a1ae77bbe7fd21aabad5..eccda08ceb729dd178dcbd5de1b3146cc65be5d4 100644 (file)
--- a/client/snapper.cc
+++ b/client/snapper.cc
@@ -36,9 +36,9 @@
 #include "utils/text.h"
 #include "utils/Table.h"
 #include "utils/GetOpts.h"
+#include "proxy/errors.h"
+#include "proxy/proxy.h"
 
-#include "errors.h"
-#include "proxy.h"
 #include "GlobalOptions.h"
 #include "cmd.h"
 

diff --git a/client/systemd-helper.cc b/client/systemd-helper.cc
index a1f2bc96b7a17ee7ac1b4d486f3b66252869a1a2..2801c5ad6ad2241619e64fd5be27fa196aabd785 100644 (file)
--- a/client/systemd-helper.cc
+++ b/client/systemd-helper.cc
@@ -31,10 +31,10 @@
 
 #include "utils/text.h"
 #include "utils/GetOpts.h"
+#include "proxy/proxy.h"
+#include "proxy/errors.h"
 
-#include "proxy.h"
 #include "cleanup.h"
-#include "errors.h"
 #include "misc.h"
 
 

diff --git a/configure.ac b/configure.ac
index a31471959610b0aefa08f4a4d4c2f8e70f64ee5e..8ee4d7b9dac1246286083be3ccb996f9d953c34c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,7 @@ AC_CONFIG_FILES([
        server/Makefile
        client/Makefile
        client/utils/Makefile
+       client/proxy/Makefile
        scripts/Makefile
        pam/Makefile
        data/Makefile

diff --git a/po/Makefile.am b/po/Makefile.am
index 541264289911f03104d02876412c128787ebb6e3..56072222b3e05f56613cef6f739b52e57406edff 100644 (file)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -6,7 +6,7 @@ XGETTEXT = xgettext
 MSGFMT = msgfmt
 MSGMERGE = msgmerge
 
-SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/utils/*.cc)
+SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/utils/*.cc ../client/proxy/*.cc)
 
 POFILES = $(wildcard *.po)
 

diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
index de58ebefd2813de24c403269fa3794cfa1450955..9d102e0fdebcef6e694cc4e1a3ed4ea499432cdd 100644 (file)
--- a/zypp-plugin/Makefile.am
+++ b/zypp-plugin/Makefile.am
@@ -18,7 +18,7 @@ snapper_zypp_plugin_SOURCES = \
        zypp-plugin.cc zypp-plugin.h
 
 snapper_zypp_plugin_LDADD = \
-       ../client/libclient.la \
+       ../client/proxy/libclient.la \
        ../snapper/libsnapper.la \
        ../dbus/libdbus.la \
        ../stomp/libstomp.la \

diff --git a/zypp-plugin/snapper-zypp-plugin.cc b/zypp-plugin/snapper-zypp-plugin.cc
index e13dc33d92f940f3cf6972fdf4fd4106926db432..2909a301b4f6a31c462462a157c0f9d80bf27746 100644 (file)
--- a/zypp-plugin/snapper-zypp-plugin.cc
+++ b/zypp-plugin/snapper-zypp-plugin.cc
@@ -39,8 +39,8 @@
 #include "dbus/DBusConnection.h"
 #include "snapper/Exception.h"
 #include "snapper/Log.h"
-#include "client/commands.h"
-#include "client/errors.h"
+#include "client/proxy/commands.h"
+#include "client/proxy/errors.h"
 
 #include "snapper-zypp-plugin.h"