From d86b0ddc21848482e2f8fd84e9d94ef1bc593786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sat, 11 Jan 2020 14:59:39 +0100 Subject: [PATCH] fcft/tllist: remove git submodules --- .gitignore | 1 + .gitmodules | 6 ------ README.md | 24 ++++++++++++------------ subprojects/fcft | 1 - subprojects/tllist | 1 - 5 files changed, 13 insertions(+), 20 deletions(-) delete mode 160000 subprojects/fcft delete mode 160000 subprojects/tllist 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 index a17a9788..00000000 --- a/subprojects/fcft +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a17a9788b55a5a47615522e9d7c338e2430cb401 diff --git a/subprojects/tllist b/subprojects/tllist deleted file mode 160000 index 5054d3db..00000000 --- a/subprojects/tllist +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5054d3dbbbd7d76e35f9d0d875e3c7f500fde52b