- move mksubvolume to own directory

diff --git a/client/.gitignore b/client/.gitignore
index ee9c6716f5698627d8f3996f6d6642bd1f1a9b86..3dbf75bb5a54d14d7b59b41eae6b495424963f0e 100644 (file)
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -4,4 +4,3 @@
 snapper
 systemd-helper
 installation-helper
-mksubvolume

diff --git a/client/Makefile.am b/client/Makefile.am
index 5166702f3344b954fd837b2b7b6cd933793c47a7..be47fe295294dc44299d7771be08e390711900db 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/client
 #
 
-SUBDIRS = utils proxy
+SUBDIRS = utils proxy mksubvolume
 
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
@@ -69,15 +69,4 @@ installation_helper_SOURCES =                \
 
 installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la
 
-if ENABLE_ROLLBACK
-
-sbin_PROGRAMS = mksubvolume
-
-mksubvolume_SOURCES =                  \
-       mksubvolume.cc
-
-mksubvolume_LDADD = ../snapper/libsnapper.la utils/libutils.la
-
-endif
-
 endif

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

diff --git a/client/mksubvolume/Makefile.am b/client/mksubvolume/Makefile.am
new file mode 100644 (file)
index 0000000..07a3ae9
--- /dev/null
+++ b/client/mksubvolume/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Makefile.am for snapper/client/mksubvolume
+#
+
+AM_CPPFLAGS = -I$(top_srcdir)
+
+if ENABLE_BTRFS
+
+if ENABLE_ROLLBACK
+
+sbin_PROGRAMS = mksubvolume
+
+mksubvolume_SOURCES =                  \
+       mksubvolume.cc
+
+mksubvolume_LDADD =                    \
+       ../../snapper/libsnapper.la     \
+       ../utils/libutils.la
+
+endif
+
+endif

diff --git a/client/mksubvolume.cc b/client/mksubvolume/mksubvolume.cc
similarity index 99%
rename from client/mksubvolume.cc
rename to client/mksubvolume/mksubvolume.cc
index 36e29572687e966b9e57387dbdfe64a092c0b86d..bca6ed4ad770e74db7f829c12968a0cf4fae155c 100644 (file)
--- a/client/mksubvolume.cc
+++ b/client/mksubvolume/mksubvolume.cc
@@ -34,7 +34,7 @@
 #include "snapper/BtrfsUtils.h"
 #include "snapper/AppUtil.h"
 #include "snapper/MntTable.h"
-#include "utils/GetOpts.h"
+#include "../utils/GetOpts.h"
 
 
 using namespace snapper;

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

diff --git a/po/Makefile.am b/po/Makefile.am
index 56072222b3e05f56613cef6f739b52e57406edff..36130ca44ebec5965d1f4deef62ded421707ca76 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 ../client/proxy/*.cc)
+SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/*/*.cc)
 
 POFILES = $(wildcard *.po)