aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-11 13:59:39 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-11 13:59:39 +0000
commitd86b0ddc21848482e2f8fd84e9d94ef1bc593786 (patch)
tree06d93aac406c4115ba67e719a665632b118b99d7
parentkeymap: add KP enter (diff)
fcft/tllist: remove git submodules
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules6
-rw-r--r--README.md24
m---------subprojects/fcft0
m---------subprojects/tllist0
5 files changed, 13 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index f56917dd..1e67045e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/bld/
/pkg/
/src/
+/subprojects/
diff --git a/.gitmodules b/.gitmodules
index a4a614b8..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "subprojects/tllist"]
- path = subprojects/tllist
- url = https://codeberg.org/dnkl/tllist.git
-[submodule "subprojects/fcft"]
- path = subprojects/fcft
- url = https://codeberg.org/dnkl/fcft.git
diff --git a/README.md b/README.md
index 83bc6fe1..153ca554 100644
--- a/README.md
+++ b/README.md
@@ -229,15 +229,10 @@ libraries, or you can build them as _subprojects_ in foot.
When building foot, they will first be searched for as system
libraries. If **found**, foot will link dynamically against them.
-If **not** found, they will be searched for as subprojects. In a foot
-git clone, they will be available as git _submodules_ and you can
-simply check them out with `git submodule update --init`. In this
-case, foot will link statically against them.
-
-If you have downloaded a zip/tar file, you need to manually copy the
-correct version of the library source code into the `subprojects`
-folder. If you are unsure how to do this, it might be easier to
-install them as system libraries.
+If **not** found, they will be searched for as subprojects. In this
+case you need to create the `subprojects` directory and clone
+https://codeberg.org/dnkl/fcft.git and
+https://codeberg.org/dnkl/tllist.git (see [Other](#other) below).
### Arch Linux
@@ -268,10 +263,15 @@ you intend to install a release build of foot, in which case you might
be interested in the compiler flags used there.
If you have not installed [tllist](https://codeberg.org/dnkl/tllist)
-and [fcft](https://codeberg.org/dnkl/fcft) as system libraries, check
-them out as git submodules:
+and [fcft](https://codeberg.org/dnkl/fcft) as system libraries, clone
+them into the `subprojects` directory:
+
```sh
-git submodule update --init
+mkdir -p subprojects
+pushd subprojects
+git clone https://codeberg.org/dnkl/tllist.git
+git clone https://codeberg.org/dnkl/fcft.git
+popd
```
To build, first, create a build directory, and switch to it:
diff --git a/subprojects/fcft b/subprojects/fcft
deleted file mode 160000
-Subproject a17a9788b55a5a47615522e9d7c338e2430cb40
diff --git a/subprojects/tllist b/subprojects/tllist
deleted file mode 160000
-Subproject 5054d3dbbbd7d76e35f9d0d875e3c7f500fde52