Merge pull request #159 from igaw/build-cleanups

Build cleanups

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

@@ -11,6 +11,8 @@ project(
     version: '1.0',
     license: 'LGPLv2+',
     default_options: [
+        'c_std=gnu99',
+        'warning_level=1',
         'buildtype=release',
         'prefix=/usr',
     ]
@@ -34,12 +36,12 @@ pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgc
 conf = configuration_data()
 
 # Check for libuuid availability
-libuuid = dependency('uuid', required: true)
-conf.set('CONFIG_LIBUUID', libuuid.found(), description: 'Is libuuid required?')
+libuuid_dep = dependency('uuid', required: true)
+conf.set('CONFIG_LIBUUID', libuuid_dep.found(), description: 'Is libuuid required?')
 
 # Check for json-c availability
-json_c = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c_dep'])
-conf.set('CONFIG_JSONC', json_c.found(), description: 'Is json-c required?')
+json_c_dep = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c_dep'])
+conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c required?')
 
 # local (cross-compilable) implementations of ccan configure steps
 conf.set10(
@@ -133,8 +135,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/libnvme.map

@@ -190,14 +190,14 @@ LIBNVME_1_0 {
 		nvme_ns_get_eui64;
 		nvme_ns_get_fd;
 		nvme_ns_get_firmware;
+		nvme_ns_get_generic_name;
 		nvme_ns_get_lba_count;
 		nvme_ns_get_lba_size;
 		nvme_ns_get_lba_util;
 		nvme_ns_get_meta_size;
 		nvme_ns_get_model;
 		nvme_ns_get_model;
 		nvme_ns_get_name;
-		nvme_ns_get_generic_name;
 		nvme_ns_get_nguid;
 		nvme_ns_get_nsid;
 		nvme_ns_get_serial;
@@ -289,8 +289,8 @@ LIBNVME_1_0 {
 		nvme_subsystem_get_host;
 		nvme_subsystem_get_name;
 		nvme_subsystem_get_nqn;
-		nvme_subsystem_get_type;
 		nvme_subsystem_get_sysfs_dir;
+		nvme_subsystem_get_type;
 		nvme_subsystem_lookup_namespace;
 		nvme_subsystem_next_ctrl;
 		nvme_subsystem_next_ns;
@@ -315,6 +315,7 @@ LIBNVME_1_0 {
 		nvmf_cms_str;
 		nvmf_connect_disc_entry;
 		nvmf_default_config;
+		nvmf_eflags_str;
 		nvmf_get_discovery_log;
 		nvmf_hostid_from_file;
 		nvmf_hostnqn_from_file;
@@ -325,7 +326,6 @@ LIBNVME_1_0 {
 		nvmf_subtype_str;
 		nvmf_treq_str;
 		nvmf_trtype_str;
-		nvmf_eflags_str;
 	local:
 		*;
 };

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',
@@ -26,8 +21,8 @@ if conf.get('CONFIG_JSONC')
 endif
 
 deps = [
-    libuuid,
-    json_c,
+    libuuid_dep,
+    json_c_dep,
 ]
 
 source_dir = meson.current_source_dir()
@@ -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

@@ -8,30 +8,30 @@
 main = executable(
     'main-test',
     ['test.c'],
-    dependencies: libuuid,
+    dependencies: libuuid_dep,
     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)