From 6416e2a1a4679677a1c1f16fbbeeeeb6c6a210df Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sat, 2 Apr 2022 11:28:11 +0200
Subject: [PATCH] test: minor refactor in build system

Add Makefile.am in tenv and common for EXTRA_DIST.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 configure.ac            | 4 ++--
 test/Makefile.am        | 8 +++-----
 test/common/.gitignore  | 2 ++
 test/common/Makefile.am | 2 ++
 test/tenv/.gitignore    | 2 ++
 test/tenv/Makefile.am   | 2 ++
 6 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 test/common/.gitignore
 create mode 100644 test/common/Makefile.am
 create mode 100644 test/tenv/.gitignore
 create mode 100644 test/tenv/Makefile.am

diff --git a/configure.ac b/configure.ac
index f72c298a..cb2fa2b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,8 @@ AC_CONFIG_FILES([Makefile
 	man/Makefile
 	plugins/Makefile
 	src/Makefile
-	test/test.env
-	test/Makefile])
+	test/test.env test/Makefile
+	test/tenv/Makefile test/common/Makefile])
 
 # Older versions of autoconf (<2.58) do not have AC_CONFIG_MACRO_DIR()
 #m4_include([m4/plugin.m4])
diff --git a/test/Makefile.am b/test/Makefile.am
index 6904c6f4..5e519cd9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,6 @@
-EXTRA_DIST		 = tenv/lib.sh tenv/exec.sh tenv/start.sh
-EXTRA_DIST		+= tenv/root.mk tenv/busybox-x86_64.md5
-EXTRA_DIST		+= tenv/chrootsetup.sh
-EXTRA_DIST		+= setup-root.sh
-EXTRA_DIST		+= common/service.conf common/service.sh common/S01-service.sh common/slay.sh
+SUBDIRS                  = common tenv
+
+EXTRA_DIST		 = setup-root.sh
 EXTRA_DIST		+= add-remove-dynamic-service.sh
 EXTRA_DIST		+= add-remove-dynamic-service-sub-config.sh
 EXTRA_DIST		+= start-stop-service.sh
diff --git a/test/common/.gitignore b/test/common/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/test/common/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/test/common/Makefile.am b/test/common/Makefile.am
new file mode 100644
index 00000000..69e9a17d
--- /dev/null
+++ b/test/common/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST	= service.conf service.sh S01-service.sh slay.sh
+
diff --git a/test/tenv/.gitignore b/test/tenv/.gitignore
new file mode 100644
index 00000000..b336cc7c
--- /dev/null
+++ b/test/tenv/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/test/tenv/Makefile.am b/test/tenv/Makefile.am
new file mode 100644
index 00000000..bc7353cd
--- /dev/null
+++ b/test/tenv/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST	 = lib.sh exec.sh start.sh root.mk busybox-x86_64.md5
+EXTRA_DIST	+= chrootsetup.sh