aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--fiv-io.c2
-rw-r--r--meson.build3
m---------submodules/liberty (renamed from liberty)0
m---------submodules/wuffs-mirror-release-c (renamed from wuffs-mirror-release-c)0
5 files changed, 5 insertions, 4 deletions
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
-Subproject 0e86ffe7c30a4d52eea35856b792567ca1040f5
+Subproject 0e86ffe7c30a4d52eea35856b792567ca1040f5
diff --git a/wuffs-mirror-release-c b/submodules/wuffs-mirror-release-c
-Subproject c63c4a9348fb1b52a9b60a6eb62328a97d979d9
+Subproject c63c4a9348fb1b52a9b60a6eb62328a97d979d9