From 32063f01b3e1e21710dbc158173994ae8ca86278 Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Wed, 24 Apr 2024 15:41:59 +0200 Subject: [PATCH] CONTRIBUTING: remove autotools instructions, add more information about meson This commit updates the CONTRIBUTING.md file to remove information about Autotools and add some additional tips for using meson. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1927 --- CONTRIBUTING.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9da4fd7b1..e1851f2f58 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -197,17 +197,11 @@ you can look at [this](contrib/fedora/REQUIRED_PACKAGES) script and [here](contrib/debian/REQUIRED_PACKAGES) is a script for Debian/Ubuntu. -Both meson and autotools are supported. You may choose whatever you prefer. -For autotools the common steps are +meson is the recommended way for building NetworkManager. You can configure +the build environment using the `meson setup` command: ``` -./autogen.sh $CONFIGURE_OPTIONS -make -j 8 -# optional: sudo make install -``` -and for meson it's -``` -meson build $CONFIGURE_OPTIONS +meson setup build/ $CONFIGURE_OPTIONS ninja -C build # optional: sudo meson install -C build ``` @@ -216,6 +210,13 @@ Beware to set the correct `$CONFIGURE_OPTIONS`. In particular, you may not want the default installation prefix and not overwrite files in `/usr`. +To specify options when setting up the meson environment, the `-D` argument +is used, like: `meson setup build -Ddocs=true`. + +To get a list of all possible configuration options, you can use `meson configure`. + +For additional usage, refer to the meson manual. + ### Fedora For Fedora/RHEL/CentOS, you can build an RPM from upstream sources with