From 1c61fcc5bc656d5c5ded34905213752ce0c4d6be Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch <p@janouch.name>
Date: Sun, 4 Jun 2023 12:57:24 +0200
Subject: Move git submodules to a subdirectory

---
 .gitmodules                       | 4 ++--
 fiv-io.c                          | 2 +-
 liberty                           | 1 -
 meson.build                       | 3 ++-
 submodules/liberty                | 1 +
 submodules/wuffs-mirror-release-c | 1 +
 wuffs-mirror-release-c            | 1 -
 7 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 160000 liberty
 create mode 160000 submodules/liberty
 create mode 160000 submodules/wuffs-mirror-release-c
 delete mode 160000 wuffs-mirror-release-c

diff --git a/.gitmodules b/.gitmodules
index 67b2c06..d955ecc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "wuffs-mirror-release-c"]
-	path = wuffs-mirror-release-c
+	path = submodules/wuffs-mirror-release-c
 	url = https://github.com/google/wuffs-mirror-release-c
 [submodule "liberty"]
-	path = liberty
+	path = submodules/liberty
 	url = https://git.janouch.name/p/liberty.git
diff --git a/fiv-io.c b/fiv-io.c
index 5e665be..3f9ff30 100644
--- a/fiv-io.c
+++ b/fiv-io.c
@@ -84,7 +84,7 @@
 #define WUFFS_CONFIG__MODULE__PNG
 #define WUFFS_CONFIG__MODULE__TGA
 #define WUFFS_CONFIG__MODULE__ZLIB
-#include "wuffs-mirror-release-c/release/c/wuffs-v0.3.c"
+#include "submodules/wuffs-mirror-release-c/release/c/wuffs-v0.3.c"
 
 #include "fiv-io.h"
 
diff --git a/liberty b/liberty
deleted file mode 160000
index 0e86ffe..0000000
--- a/liberty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0e86ffe7c30a4d52eea35856b792567ca1040f56
diff --git a/meson.build b/meson.build
index f196d29..44dd6ba 100644
--- a/meson.build
+++ b/meson.build
@@ -236,7 +236,8 @@ if not win32
 		else
 			command = ['env', 'LC_ALL=C',
 				'asciidoc-release-version=' + meson.project_version(),
-				'awk', '-f', files('liberty/tools/asciiman.awk'), '@INPUT@']
+				'awk', '-f', files('submodules/liberty/tools/asciiman.awk'),
+				'@INPUT@']
 			man_capture = true
 		endif
 		custom_target('manpage for ' + page,
diff --git a/submodules/liberty b/submodules/liberty
new file mode 160000
index 0000000..0e86ffe
--- /dev/null
+++ b/submodules/liberty
@@ -0,0 +1 @@
+Subproject commit 0e86ffe7c30a4d52eea35856b792567ca1040f56
diff --git a/submodules/wuffs-mirror-release-c b/submodules/wuffs-mirror-release-c
new file mode 160000
index 0000000..c63c4a9
--- /dev/null
+++ b/submodules/wuffs-mirror-release-c
@@ -0,0 +1 @@
+Subproject commit c63c4a9348fb1b52a9b60a6eb62328a97d979d9e
diff --git a/wuffs-mirror-release-c b/wuffs-mirror-release-c
deleted file mode 160000
index c63c4a9..0000000
--- a/wuffs-mirror-release-c
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c63c4a9348fb1b52a9b60a6eb62328a97d979d9e
-- 
cgit v1.2.3-70-g09d2