diff --git a/client/.gitignore b/client/.gitignore index 1c40c4183..cf19bd8c5 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -1,4 +1,3 @@ *.o *.lo *.la -snapper diff --git a/client/Makefile.am b/client/Makefile.am index f0bc8394c..59de7e6b8 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -2,43 +2,4 @@ # Makefile.am for snapper/client # -SUBDIRS = utils proxy mksubvolume installation-helper systemd-helper - -AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) - -bin_PROGRAMS = snapper - -snapper_SOURCES = \ - snapper.cc \ - cmd.h \ - cmd-list-configs.cc \ - cmd-create-config.cc \ - cmd-delete-config.cc \ - cmd-get-config.cc \ - cmd-set-config.cc \ - cmd-list.cc \ - cmd-create.cc \ - cmd-modify.cc \ - cmd-delete.cc \ - cmd-mount.cc \ - cmd-umount.cc \ - cmd-status.cc \ - cmd-diff.cc \ - cmd-xadiff.cc \ - cmd-undochange.cc \ - cmd-rollback.cc \ - cmd-setup-quota.cc \ - cmd-cleanup.cc \ - cmd-debug.cc \ - cleanup.cc cleanup.h \ - misc.cc misc.h \ - MyFiles.cc MyFiles.h \ - GlobalOptions.cc GlobalOptions.h - -snapper_LDADD = \ - proxy/libproxy.la \ - proxy/libclient.la \ - ../snapper/libsnapper.la \ - utils/libutils.la \ - ../dbus/libdbus.la \ - $(JSON_C_LIBS) +SUBDIRS = utils proxy snapper mksubvolume installation-helper systemd-helper diff --git a/client/snapper/.gitignore b/client/snapper/.gitignore new file mode 100644 index 000000000..1c40c4183 --- /dev/null +++ b/client/snapper/.gitignore @@ -0,0 +1,4 @@ +*.o +*.lo +*.la +snapper diff --git a/client/GlobalOptions.cc b/client/snapper/GlobalOptions.cc similarity index 98% rename from client/GlobalOptions.cc rename to client/snapper/GlobalOptions.cc index 0aa42f167..47df9b1f4 100644 --- a/client/GlobalOptions.cc +++ b/client/snapper/GlobalOptions.cc @@ -21,9 +21,9 @@ #include -#include "utils/help.h" -#include "misc.h" -#include "client/GlobalOptions.h" +#include "../utils/help.h" +#include "../misc.h" +#include "GlobalOptions.h" #include "client/utils/text.h" #include "client/utils/TableFormatter.h" #include "client/utils/CsvFormatter.h" diff --git a/client/GlobalOptions.h b/client/snapper/GlobalOptions.h similarity index 100% rename from client/GlobalOptions.h rename to client/snapper/GlobalOptions.h diff --git a/client/snapper/Makefile.am b/client/snapper/Makefile.am new file mode 100644 index 000000000..f64f37adb --- /dev/null +++ b/client/snapper/Makefile.am @@ -0,0 +1,42 @@ +# +# Makefile.am for snapper/client/snapper +# + +AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + +bin_PROGRAMS = snapper + +snapper_SOURCES = \ + snapper.cc \ + cmd.h \ + cmd-list-configs.cc \ + cmd-create-config.cc \ + cmd-delete-config.cc \ + cmd-get-config.cc \ + cmd-set-config.cc \ + cmd-list.cc \ + cmd-create.cc \ + cmd-modify.cc \ + cmd-delete.cc \ + cmd-mount.cc \ + cmd-umount.cc \ + cmd-status.cc \ + cmd-diff.cc \ + cmd-xadiff.cc \ + cmd-undochange.cc \ + cmd-rollback.cc \ + cmd-setup-quota.cc \ + cmd-cleanup.cc \ + cmd-debug.cc \ + ../cleanup.cc ../cleanup.h \ + ../misc.cc ../misc.h \ + MyFiles.cc MyFiles.h \ + GlobalOptions.cc GlobalOptions.h + +snapper_LDADD = \ + ../proxy/libproxy.la \ + ../proxy/libclient.la \ + ../../snapper/libsnapper.la \ + ../utils/libutils.la \ + ../../dbus/libdbus.la \ + $(JSON_C_LIBS) diff --git a/client/MyFiles.cc b/client/snapper/MyFiles.cc similarity index 97% rename from client/MyFiles.cc rename to client/snapper/MyFiles.cc index 48b5fe2b0..19dd932a9 100644 --- a/client/MyFiles.cc +++ b/client/snapper/MyFiles.cc @@ -23,8 +23,8 @@ #include -#include "proxy/proxy.h" -#include "utils/text.h" +#include "../proxy/proxy.h" +#include "../utils/text.h" #include "GlobalOptions.h" #include diff --git a/client/MyFiles.h b/client/snapper/MyFiles.h similarity index 97% rename from client/MyFiles.h rename to client/snapper/MyFiles.h index b3dfcd6ab..ddd6ae471 100644 --- a/client/MyFiles.h +++ b/client/snapper/MyFiles.h @@ -25,7 +25,7 @@ #include -#include "utils/GetOpts.h" +#include "../utils/GetOpts.h" namespace snapper diff --git a/client/cmd-cleanup.cc b/client/snapper/cmd-cleanup.cc similarity index 98% rename from client/cmd-cleanup.cc rename to client/snapper/cmd-cleanup.cc index d07a91faa..9afbef157 100644 --- a/client/cmd-cleanup.cc +++ b/client/snapper/cmd-cleanup.cc @@ -32,13 +32,13 @@ #endif #include -#include "utils/HumanString.h" -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/HumanString.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "cleanup.h" -#include "misc.h" +#include "../cleanup.h" +#include "../misc.h" #include "cmd.h" diff --git a/client/cmd-create-config.cc b/client/snapper/cmd-create-config.cc similarity index 96% rename from client/cmd-create-config.cc rename to client/snapper/cmd-create-config.cc index 0d0707d42..0852af47d 100644 --- a/client/cmd-create-config.cc +++ b/client/snapper/cmd-create-config.cc @@ -25,9 +25,9 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-create.cc b/client/snapper/cmd-create.cc similarity index 98% rename from client/cmd-create.cc rename to client/snapper/cmd-create.cc index 026ac8cfc..4abdb63a5 100644 --- a/client/cmd-create.cc +++ b/client/snapper/cmd-create.cc @@ -25,11 +25,11 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" +#include "../misc.h" namespace snapper diff --git a/client/cmd-debug.cc b/client/snapper/cmd-debug.cc similarity index 96% rename from client/cmd-debug.cc rename to client/snapper/cmd-debug.cc index 36da6d2ce..28d1d8db8 100644 --- a/client/cmd-debug.cc +++ b/client/snapper/cmd-debug.cc @@ -23,8 +23,8 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-delete-config.cc b/client/snapper/cmd-delete-config.cc similarity index 96% rename from client/cmd-delete-config.cc rename to client/snapper/cmd-delete-config.cc index ff11e02ef..4ac055f5d 100644 --- a/client/cmd-delete-config.cc +++ b/client/snapper/cmd-delete-config.cc @@ -23,8 +23,8 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-delete.cc b/client/snapper/cmd-delete.cc similarity index 97% rename from client/cmd-delete.cc rename to client/snapper/cmd-delete.cc index 2eda1c521..60e3a7c0e 100644 --- a/client/cmd-delete.cc +++ b/client/snapper/cmd-delete.cc @@ -25,9 +25,9 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-diff.cc b/client/snapper/cmd-diff.cc similarity index 96% rename from client/cmd-diff.cc rename to client/snapper/cmd-diff.cc index d24c3dd0a..f008f7916 100644 --- a/client/cmd-diff.cc +++ b/client/snapper/cmd-diff.cc @@ -25,11 +25,11 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" +#include "../misc.h" #include "MyFiles.h" diff --git a/client/cmd-get-config.cc b/client/snapper/cmd-get-config.cc similarity index 95% rename from client/cmd-get-config.cc rename to client/snapper/cmd-get-config.cc index 0d8b4f83e..e4b8e157b 100644 --- a/client/cmd-get-config.cc +++ b/client/snapper/cmd-get-config.cc @@ -23,14 +23,14 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" -#include "utils/TableFormatter.h" -#include "utils/CsvFormatter.h" -#include "utils/JsonFormatter.h" +#include "../misc.h" +#include "../utils/TableFormatter.h" +#include "../utils/CsvFormatter.h" +#include "../utils/JsonFormatter.h" namespace snapper diff --git a/client/cmd-list-configs.cc b/client/snapper/cmd-list-configs.cc similarity index 95% rename from client/cmd-list-configs.cc rename to client/snapper/cmd-list-configs.cc index 274cbf29a..345e2542e 100644 --- a/client/cmd-list-configs.cc +++ b/client/snapper/cmd-list-configs.cc @@ -23,14 +23,14 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" -#include "utils/TableFormatter.h" -#include "utils/CsvFormatter.h" -#include "utils/JsonFormatter.h" +#include "../misc.h" +#include "../utils/TableFormatter.h" +#include "../utils/CsvFormatter.h" +#include "../utils/JsonFormatter.h" namespace snapper diff --git a/client/cmd-list.cc b/client/snapper/cmd-list.cc similarity index 98% rename from client/cmd-list.cc rename to client/snapper/cmd-list.cc index 70805bd84..acb1cd7fe 100644 --- a/client/cmd-list.cc +++ b/client/snapper/cmd-list.cc @@ -29,17 +29,17 @@ #include #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" -#include "proxy/locker.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" +#include "../proxy/locker.h" #include "GlobalOptions.h" -#include "misc.h" -#include "utils/TableFormatter.h" -#include "utils/CsvFormatter.h" -#include "utils/JsonFormatter.h" +#include "../misc.h" +#include "../utils/TableFormatter.h" +#include "../utils/CsvFormatter.h" +#include "../utils/JsonFormatter.h" #include "dbus/DBusMessage.h" -#include "utils/HumanString.h" +#include "../utils/HumanString.h" namespace snapper diff --git a/client/cmd-modify.cc b/client/snapper/cmd-modify.cc similarity index 97% rename from client/cmd-modify.cc rename to client/snapper/cmd-modify.cc index 90c378c96..f10668632 100644 --- a/client/cmd-modify.cc +++ b/client/snapper/cmd-modify.cc @@ -25,11 +25,11 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" +#include "../misc.h" namespace snapper diff --git a/client/cmd-mount.cc b/client/snapper/cmd-mount.cc similarity index 96% rename from client/cmd-mount.cc rename to client/snapper/cmd-mount.cc index dcc0fd1e7..1da525b31 100644 --- a/client/cmd-mount.cc +++ b/client/snapper/cmd-mount.cc @@ -23,8 +23,8 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-rollback.cc b/client/snapper/cmd-rollback.cc similarity index 98% rename from client/cmd-rollback.cc rename to client/snapper/cmd-rollback.cc index a4748db16..80447fba3 100644 --- a/client/cmd-rollback.cc +++ b/client/snapper/cmd-rollback.cc @@ -29,11 +29,11 @@ #include #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" +#include "../misc.h" namespace snapper diff --git a/client/cmd-set-config.cc b/client/snapper/cmd-set-config.cc similarity index 95% rename from client/cmd-set-config.cc rename to client/snapper/cmd-set-config.cc index 234907ec1..d43e55296 100644 --- a/client/cmd-set-config.cc +++ b/client/snapper/cmd-set-config.cc @@ -23,10 +23,10 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" -#include "misc.h" +#include "../misc.h" namespace snapper diff --git a/client/cmd-setup-quota.cc b/client/snapper/cmd-setup-quota.cc similarity index 96% rename from client/cmd-setup-quota.cc rename to client/snapper/cmd-setup-quota.cc index 15461922f..d720981e5 100644 --- a/client/cmd-setup-quota.cc +++ b/client/snapper/cmd-setup-quota.cc @@ -23,8 +23,8 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-status.cc b/client/snapper/cmd-status.cc similarity index 97% rename from client/cmd-status.cc rename to client/snapper/cmd-status.cc index be4235721..2e0d3db4f 100644 --- a/client/cmd-status.cc +++ b/client/snapper/cmd-status.cc @@ -25,9 +25,9 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" #include "MyFiles.h" diff --git a/client/cmd-umount.cc b/client/snapper/cmd-umount.cc similarity index 96% rename from client/cmd-umount.cc rename to client/snapper/cmd-umount.cc index 067af6ae3..91e8f2b84 100644 --- a/client/cmd-umount.cc +++ b/client/snapper/cmd-umount.cc @@ -23,8 +23,8 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/cmd-undochange.cc b/client/snapper/cmd-undochange.cc similarity index 98% rename from client/cmd-undochange.cc rename to client/snapper/cmd-undochange.cc index a0726ca51..16984145d 100644 --- a/client/cmd-undochange.cc +++ b/client/snapper/cmd-undochange.cc @@ -25,9 +25,9 @@ #include -#include "utils/text.h" -#include "utils/help.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/help.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" #include "MyFiles.h" diff --git a/client/cmd-xadiff.cc b/client/snapper/cmd-xadiff.cc similarity index 98% rename from client/cmd-xadiff.cc rename to client/snapper/cmd-xadiff.cc index 15aa26dfe..802b56ea5 100644 --- a/client/cmd-xadiff.cc +++ b/client/snapper/cmd-xadiff.cc @@ -27,8 +27,8 @@ #include -#include "utils/text.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" #include "MyFiles.h" diff --git a/client/cmd.h b/client/snapper/cmd.h similarity index 99% rename from client/cmd.h rename to client/snapper/cmd.h index 44c7d14dd..7bb5c4237 100644 --- a/client/cmd.h +++ b/client/snapper/cmd.h @@ -23,7 +23,7 @@ #include "config.h" -#include "proxy/proxy.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/snapper.cc b/client/snapper/snapper.cc similarity index 98% rename from client/snapper.cc rename to client/snapper/snapper.cc index eccda08ce..0bf5e6ca7 100644 --- a/client/snapper.cc +++ b/client/snapper/snapper.cc @@ -33,11 +33,11 @@ #include #include -#include "utils/text.h" -#include "utils/Table.h" -#include "utils/GetOpts.h" -#include "proxy/errors.h" -#include "proxy/proxy.h" +#include "../utils/text.h" +#include "../utils/Table.h" +#include "../utils/GetOpts.h" +#include "../proxy/errors.h" +#include "../proxy/proxy.h" #include "GlobalOptions.h" #include "cmd.h" diff --git a/configure.ac b/configure.ac index fc2804ddc..11fcf31e5 100644 --- a/configure.ac +++ b/configure.ac @@ -218,6 +218,7 @@ AC_CONFIG_FILES([ client/Makefile client/utils/Makefile client/proxy/Makefile + client/snapper/Makefile client/mksubvolume/Makefile client/installation-helper/Makefile client/systemd-helper/Makefile