libnvme/meson: rearrange the config.h dependencies

Explicitly add 'config_dep' to 'deps' to ensure that config.h
is generated before building libnvme.

When defining 'c_args', use the '-include' option directly
instead of hiding it in 'config_h_arg'. This makes the
meson.build file clearer. Since '-include' is used to include
config.h, there is no need to add 'internal_incdir' to the
include path via '-I' (i.e. with 'include_directories' argument).

Note: using '-include' is the Meson-recommended way to include
generated headers. The '-I' option (via 'include_directories')
should be reserved for static headers.

Signed-off-by: Martin Belanger <[email protected]>

Author: Martin Belanger

libnvme/internal/meson.build

@@ -20,5 +20,8 @@ config_dep = declare_dependency(
   include_directories : internal_incdir,
   sources: config_h)
 
-config_h_path = meson.current_build_dir() / 'config.h'
-config_h_arg =  [ '-include', config_h_path ]
+if meson.version().version_compare('>=1.4.0')
+    config_h_path = config_h.full_path()
+else
+    config_h_path = meson.current_build_dir() / 'config.h'
+endif

libnvme/src/meson.build

@@ -33,6 +33,7 @@ deps = [
     libdbus_dep,
     liburing_dep,
     openssl_dep,
+    config_dep,
 ]
 
 source_dir = meson.current_source_dir()
@@ -46,8 +47,10 @@ libnvme = library(
     link_args: ['-Wl,--version-script=' + version_script_arg],
     dependencies: deps,
     link_depends: mapfile,
-    c_args: config_h_arg,
-    include_directories: [incdir, internal_incdir],
+    c_args: [
+        '-include', config_h_path,
+    ],
+    include_directories: [incdir, ],
     install: true,
     link_with: libccan,
 )
@@ -75,8 +78,10 @@ libnvme_test = library(
     'nvme-test', # produces libnvme-test.so
     sources,
     dependencies: deps,
-    c_args: config_h_arg,
-    include_directories: [incdir, internal_incdir],
+    c_args: [
+        '-include', config_h_path,
+    ],
+    include_directories: [incdir, ],
     install: false,
     link_with: libccan,
 )