| Message ID | 165118380572.1676208.16232543117821121022.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6d0e543f8bf01219b793cf4d7a603d3dfd7844ed |
| Headers | show |
| Series | CXL topology unit test | expand |
diff --git a/cxl/meson.build b/cxl/meson.build index 87cfea73e40b..671c8e1626ef 100644 --- a/cxl/meson.build +++ b/cxl/meson.build @@ -3,8 +3,6 @@ cxl_src = [ 'list.c', 'port.c', 'memdev.c', - '../util/json.c', - '../util/log.c', 'json.c', 'filter.c', ] diff --git a/daxctl/meson.build b/daxctl/meson.build index 8474d02f2c0d..8f27dd71b965 100644 --- a/daxctl/meson.build +++ b/daxctl/meson.build @@ -4,7 +4,6 @@ daxctl_src = [ 'list.c', 'migrate.c', 'device.c', - '../util/json.c', 'json.c', 'filter.c', ] diff --git a/ndctl/meson.build b/ndctl/meson.build index c7889af36084..050d5769c384 100644 --- a/ndctl/meson.build +++ b/ndctl/meson.build @@ -6,11 +6,9 @@ ndctl_src = [ 'check.c', 'region.c', 'dimm.c', - '../util/log.c', '../daxctl/filter.c', 'filter.c', 'list.c', - '../util/json.c', '../daxctl/json.c', 'json.c', 'json-smart.c', diff --git a/util/meson.build b/util/meson.build index 695037a924b9..a6ded7ee1473 100644 --- a/util/meson.build +++ b/util/meson.build @@ -3,6 +3,8 @@ util = static_library('util', [ 'parse-configs.c', 'usage.c', 'size.c', + 'json.c', + 'log.c', 'main.c', 'help.c', 'strbuf.c',
Stop listing util/json.c and util/log.c per command, just add them to the common libutil.a object. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- cxl/meson.build | 2 -- daxctl/meson.build | 1 - ndctl/meson.build | 2 -- util/meson.build | 2 ++ 4 files changed, 2 insertions(+), 5 deletions(-)