build: Avoid including wrong config.h as subpackage

In case the consuming project also uses a config.h we need to hide our
config.h file. By using the path to our config.h we avoid this
confusion. Obviously, 'src' is a bit too generic, thus move the
generated config.h under libnvme.

Introduce also a private include path because ccan has '#include
"config.h"' in its sources. So we need to present a config.h in the
lookup path but it needs to be the one from this project and not the
one from the consuming project.

Signed-off-by: Daniel Wagner <[email protected]>

Author: dwsuse

examples/meson.build

@@ -9,17 +9,20 @@ executable(
     'telemetry-listen',
     ['telemetry-listen.c'],
     link_with: libnvme,
-    include_directories: incdir)
+    include_directories: [incdir, internal_incdir]
+)
 
 executable(
     'display-columnar',
     ['display-columnar.c'],
     link_with: libnvme,
-    include_directories: incdir)
+    include_directories: [incdir, internal_incdir]
+)
 
 executable(
     'discover-loop',
     ['discover-loop.c'],
     link_with: libnvme,
-    include_directories: incdir)
+    include_directories: [incdir, internal_incdir]
+)
 

libnvme/meson.build

@@ -5,6 +5,10 @@
 #
 # Authors: Martin Belanger <[email protected]>
 #
+configure_file(
+    output: 'config.h',
+    configuration: conf
+)
 
 want_python = get_option('python')
 if want_python != 'false'

meson.build

@@ -133,8 +133,9 @@ configure_file(
 
 ################################################################################
 add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE',
-                       '-include', 'config.h'], language : 'c')
-incdir = include_directories(['ccan', 'src'])
+                       '-include', 'libnvme/config.h'], language : 'c')
+incdir = include_directories(['.', 'ccan', 'src'])
+internal_incdir = include_directories('libnvme')
 
 ################################################################################
 sources = []

src/meson.build

@@ -5,11 +5,6 @@
 #
 # Authors: Martin Belanger <[email protected]>
 #
-configure_file(
-    output: 'config.h',
-    configuration: conf
-)
-
 sources += [
     'nvme/cleanup.c',
     'nvme/fabrics.c',
@@ -41,7 +36,7 @@ libnvme = library(
     link_args: ['-Wl,--version-script=' + version_script_arg],
     dependencies: deps,
     link_depends: mapfile,
-    include_directories: incdir,
+    include_directories: [incdir, internal_incdir],
     install: true,
 )
 

test/meson.build

@@ -10,28 +10,28 @@ main = executable(
     ['test.c'],
     dependencies: libuuid,
     link_with: libnvme,
-    include_directories: incdir
+    include_directories: [incdir, internal_incdir]
 )
 
 cpp = executable(
     'test-cpp',
     ['cpp.cc'],
     link_with: libnvme,
-    include_directories: incdir
+    include_directories: [incdir, internal_incdir]
 )
 
 register = executable(
     'test-register',
     ['register.c'],
     link_with: libnvme,
-    include_directories: incdir
+    include_directories: [incdir, internal_incdir]
 )
 
 zns = executable(
     'test-zns',
     ['zns.c'],
     link_with: libnvme,
-    include_directories: incdir
+    include_directories: [incdir, internal_incdir]
 )
 
 test('main', main)