- moved proxy library to subdirectory

aschnell · Sep 19, 2024 · 4733c8d · 4733c8d
1 parent 24fa077
commit 4733c8d
Show file tree

Hide file tree

Showing 43 changed files with 41 additions and 56 deletions.
diff --git a/client/Makefile.am b/client/Makefile.am
@@ -6,22 +6,6 @@ SUBDIRS = utils
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,7 +20,7 @@
  */
 
 
-#include "proxy.h"
+#include "proxy/proxy.h"
 
 
 namespace snapper

diff --git 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/commands.cc → client/proxy/commands.cc b/client/commands.cc → 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 → client/proxy/commands.h b/client/commands.h → client/proxy/commands.h
diff --git a/client/errors.cc → client/proxy/errors.cc b/client/errors.cc → 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 → client/proxy/errors.h b/client/errors.h → client/proxy/errors.h
diff --git a/client/proxy-dbus.cc → client/proxy/proxy-dbus.cc b/client/proxy-dbus.cc → 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 → client/proxy/proxy-dbus.h b/client/proxy-dbus.h → client/proxy/proxy-dbus.h
diff --git a/client/proxy-lib.cc → client/proxy/proxy-lib.cc b/client/proxy-lib.cc → client/proxy/proxy-lib.cc
diff --git a/client/proxy-lib.h → client/proxy/proxy-lib.h b/client/proxy-lib.h → client/proxy/proxy-lib.h
diff --git a/client/proxy.cc → client/proxy/proxy.cc b/client/proxy.cc → 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 → client/proxy/proxy.h b/client/proxy.h → client/proxy/proxy.h
diff --git a/client/types.cc → client/proxy/types.cc b/client/types.cc → client/proxy/types.cc
diff --git a/client/types.h → client/proxy/types.h b/client/types.h → client/proxy/types.h
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"