Merge pull request #354 from eli-schwartz/uuid_h-name

fix broken includes for the uuid.h header

Author: dwsuse

examples/meson.build

@@ -8,27 +8,27 @@
 executable(
     'telemetry-listen',
     ['telemetry-listen.c'],
-    link_with: libnvme,
+    dependencies: libnvme_dep,
     include_directories: [incdir, internal_incdir]
 )
 
 executable(
     'display-columnar',
     ['display-columnar.c'],
-    link_with: libnvme,
+    dependencies: libnvme_dep,
     include_directories: [incdir, internal_incdir]
 )
 
 executable(
     'display-tree',
     ['display-tree.c'],
-    link_with: libnvme,
+    dependencies: libnvme_dep,
     include_directories: [incdir, internal_incdir]
 )
 
 executable(
     'discover-loop',
     ['discover-loop.c'],
-    link_with: libnvme,
+    dependencies: libnvme_dep,
     include_directories: [incdir, internal_incdir]
 )

libnvme/meson.build

@@ -29,9 +29,9 @@ if have_python_support
     pynvme_clib = python3.extension_module(
         '_nvme',
         pymod_swig[1],
-        dependencies : py3_dep,
+        dependencies : [libnvme_dep, py3_dep],
         include_directories: [incdir, internal_incdir],
-        link_with: [libnvme, libccan],
+        link_with: [libccan],
         install: true,
         subdir: 'libnvme',
     )

src/meson.build

@@ -53,7 +53,10 @@ pkg.generate(libnvme,
 
 libnvme_dep = declare_dependency(
     include_directories: ['.'],
-    dependencies: deps,
+    dependencies: [
+      libuuid_dep.partial_dependency(compile_args: true, includes: true),
+      json_c_dep.partial_dependency(compile_args: true, includes: true),
+    ],
     link_with: libnvme,
 )
 

src/nvme/private.h

@@ -13,7 +13,7 @@
 
 #include "fabrics.h"
 
-#include <uuid/uuid.h>
+#include <uuid.h>
 
 
 extern const char *nvme_ctrl_sysfs_dir;

src/nvme/tree.h

@@ -15,7 +15,7 @@
 #include <stddef.h>
 
 #include <sys/types.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 
 #include "ioctl.h"
 #include "util.h"

test/meson.build

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

test/test.c

@@ -19,7 +19,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <inttypes.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <libnvme.h>
 
 #include <ccan/endian/endian.h>