From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 30 Sep 2024 14:32:19 +0000 (+0200)
Subject: - move mksubvolume to own directory
X-Git-Tag: v0.12.0~30^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6c23bce5c8381d296ea20a551fb3a0ce5770a71;p=thirdparty%2Fsnapper.git

- move mksubvolume to own directory
---

diff --git a/client/.gitignore b/client/.gitignore
index ee9c6716..3dbf75bb 100644
--- 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 5166702f..be47fe29 100644
--- 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
index 00000000..7009d55b
--- /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
index 00000000..07a3ae98
--- /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 36e29572..bca6ed4a 100644
--- 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 8ee4d7b9..a59a9990 100644
--- 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 56072222..36130ca4 100644
--- 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)