diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-04-06 20:39:56 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2022-04-11 10:32:34 +0200 |
| commit | c68f31d86a7319ec67898368bb9851bd78486553 (patch) | |
| tree | 91ef2de5c65b7058ca75f31be2adf8e9265a1345 /tests | |
| parent | 03f11864b939733e5b886ebb5c3ac45d669029d2 (diff) | |
| download | flatpak-c68f31d86a7319ec67898368bb9851bd78486553.tar.gz | |
build: Consistently include libglnx header as "libglnx.h"
Recent Meson versions have warnings if you add the subprojects
directory as an include path, because the way Meson wants to consume
subprojects is by the subproject's build system producing a Meson
dependency object that encapsulates its include directory. Flatpak
doesn't have a Meson build system yet, but I'm working on that.
libglnx seems to be set up to have the libglnx directory be its include
path instead: for example, ostree (by the author of libglnx) already
uses "libglnx.h" or <libglnx.h> everywhere. Do the same here.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/can-use-fuse.c | 2 | ||||
| -rw-r--r-- | tests/hold-lock.c | 2 | ||||
| -rw-r--r-- | tests/test-instance.c | 4 | ||||
| -rw-r--r-- | tests/testlib.c | 2 | ||||
| -rw-r--r-- | tests/testlibrary.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/can-use-fuse.c b/tests/can-use-fuse.c index 25f3936e..f39d2f15 100644 --- a/tests/can-use-fuse.c +++ b/tests/can-use-fuse.c @@ -11,7 +11,7 @@ #include <glib/gstdio.h> -#include "libglnx/libglnx.h" +#include "libglnx.h" #define FUSE_USE_VERSION 26 #include <fuse_lowlevel.h> diff --git a/tests/hold-lock.c b/tests/hold-lock.c index a4f7593b..542f8af5 100644 --- a/tests/hold-lock.c +++ b/tests/hold-lock.c @@ -30,7 +30,7 @@ #include <sys/wait.h> #include <unistd.h> -#include "libglnx/libglnx.h" +#include "libglnx.h" static GArray *global_locks = NULL; static gboolean opt_wait = FALSE; diff --git a/tests/test-instance.c b/tests/test-instance.c index 3455f36a..b186d60d 100644 --- a/tests/test-instance.c +++ b/tests/test-instance.c @@ -32,8 +32,8 @@ #include "flatpak-instance-private.h" #include "flatpak-run-private.h" -#include "libglnx/libglnx.h" -#include "libglnx/tests/libglnx-testlib.h" +#include "libglnx.h" +#include "tests/libglnx-testlib.h" #include "testlib.h" diff --git a/tests/testlib.c b/tests/testlib.c index 1e5d9428..fe26a695 100644 --- a/tests/testlib.c +++ b/tests/testlib.c @@ -21,7 +21,7 @@ #include <glib.h> #include <glib/gstdio.h> -#include "libglnx/libglnx.h" +#include "libglnx.h" char * assert_mkdtemp (char *tmpl) diff --git a/tests/testlibrary.c b/tests/testlibrary.c index 7802fd72..3e2e0bc2 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c @@ -7,7 +7,7 @@ #include <glib.h> #include <ostree.h> -#include "libglnx/libglnx.h" +#include "libglnx.h" #include "flatpak.h" #include "can-use-fuse.h" |