meson: refactor build dependencies

Clean up the _sources variables. Signed-off-by: Klaus Jensen <[email protected]>
SamsungDS · Aug 11, 2023 · a60a19c · a60a19c
1 parent cb3259b
commit a60a19c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git a/include/vfn/trace/meson.build b/include/vfn/trace/meson.build
@@ -6,5 +6,3 @@ trace_events_h = custom_target('events.h',
   install: true,
   install_dir: get_option('includedir') / 'vfn/trace',
 )
-
-trace_sources = [trace_events_h]
diff --git a/src/meson.build b/src/meson.build
@@ -1,6 +1,6 @@
 core_inc = include_directories('.')
 
-core_sources = [
+gen_sources = [
   # custom (generated) targets
   config_host_h,
   ccan_config_h,
@@ -11,9 +11,7 @@ trace_sources = files(
   'trace.c',
 )
 
-vfn_sources = files(
-  'trace.c',
-)
+vfn_sources = trace_sources
 
 subdir('support')
 subdir('trace')
@@ -24,7 +22,7 @@ subdir('nvme')
 docs_deps += vfn_sources
 
 _vfn_sources = [
-  core_sources,
+  gen_sources,
   vfn_sources,
 ]
 

diff --git a/src/nvme/meson.build b/src/nvme/meson.build
@@ -5,22 +5,24 @@ crc64table_h = custom_target('crc64table_h',
   build_by_default: true,
 )
 
-core_sources += crc64table_h
+gen_sources += crc64table_h
 
-vfn_sources += files(
+nvme_sources = files(
   'core.c',
   'queue.c',
   'util.c',
 )
 
 # tests
-rq_test = executable('rq_test', [trace_sources, support_sources, vfn_sources, crc64table_h, 'rq_test.c'],
+rq_test = executable('rq_test', [gen_sources, vfn_sources, nvme_sources, 'rq_test.c'],
   link_with: [ccan_lib],
   include_directories: [ccan_inc, core_inc, vfn_inc],
 )
 
-vfn_sources += files(
+nvme_sources += files(
   'rq.c',
 )
 
+vfn_sources += nvme_sources
+
 test('rq_test', rq_test)
diff --git a/src/pci/meson.build b/src/pci/meson.build
@@ -1,3 +1,5 @@
-vfn_sources += files(
+pci_sources = files(
   'util.c',
 )
+
+vfn_sources += pci_sources
diff --git a/src/support/meson.build b/src/support/meson.build
@@ -10,7 +10,7 @@ if host_machine.cpu_family() == 'x86_64'
   subdir('arch/x86_64')
 endif
 
-core_sources += support_sources
+vfn_sources += support_sources
 
 ticks_test = executable('ticks_test', [support_sources, 'ticks_test.c'],
   link_with: [ccan_lib],

diff --git a/src/trace/meson.build b/src/trace/meson.build
@@ -6,4 +6,5 @@ trace_events_c = custom_target('trace events source',
 )
 
 trace_sources += trace_events_c
-core_sources += trace_sources
+
+gen_sources += trace_events_c
diff --git a/src/vfio/meson.build b/src/vfio/meson.build
@@ -1,14 +1,19 @@
-vfn_sources += files(
+vfio_sources = files(
   'core.c',
   'device.c',
-  'iommu.c',
   'pci.c',
 )
 
 # tests
-iommu_test = executable('iommu_test', [trace_sources, support_sources, 'iommu_test.c'],
+iommu_test = executable('iommu_test', [gen_sources, vfn_sources, vfio_sources, 'iommu_test.c'],
   link_with: [ccan_lib],
   include_directories: [ccan_inc, core_inc, vfn_inc],
 )
 
+vfio_sources += files(
+  'iommu.c',
+)
+
+vfn_sources += vfio_sources
+
 test('iommu_test', iommu_test)