From 1c61fcc5bc656d5c5ded34905213752ce0c4d6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Sun, 4 Jun 2023 12:57:24 +0200 Subject: [PATCH] Move git submodules to a subdirectory --- .gitmodules | 4 ++-- fiv-io.c | 2 +- meson.build | 3 ++- liberty => submodules/liberty | 0 wuffs-mirror-release-c => submodules/wuffs-mirror-release-c | 0 5 files changed, 5 insertions(+), 4 deletions(-) rename liberty => submodules/liberty (100%) rename wuffs-mirror-release-c => submodules/wuffs-mirror-release-c (100%) 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/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/liberty b/submodules/liberty similarity index 100% rename from liberty rename to submodules/liberty diff --git a/wuffs-mirror-release-c b/submodules/wuffs-mirror-release-c similarity index 100% rename from wuffs-mirror-release-c rename to submodules/wuffs-mirror-release-c