---
ndctl/Makefile.am | 2 +-
test/Makefile.am | 4 ++--
util/json.c | 0
util/json.h | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename ndctl/util/json.c => util/json.c (100%)
rename ndctl/util/json.h => util/json.h (100%)
diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am
index f03647ae9d99..c563e9411cc3 100644
--- a/ndctl/Makefile.am
+++ b/ndctl/Makefile.am
@@ -10,7 +10,7 @@ ndctl_SOURCES = ndctl.c \
../util/log.c \
builtin-list.c \
builtin-test.c \
- util/json.c
+ ../util/json.c
if ENABLE_SMART
ndctl_SOURCES += util/json-smart.c
diff --git a/test/Makefile.am b/test/Makefile.am
index 46a1acf98f0d..9e3ae1dab411 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -75,7 +75,7 @@ device_dax_SOURCES = \
dax-pmd.c \
core.c \
../ndctl/builtin-xaction-namespace.c \
- ../ndctl/util/json.c
+ ../util/json.c
device_dax_LDADD = \
$(LIBNDCTL_LIB) \
$(JSON_LIBS) \
@@ -85,7 +85,7 @@ multi_pmem_SOURCES = \
multi-pmem.c \
core.c \
../ndctl/builtin-xaction-namespace.c \
- ../ndctl/util/json.c
+ ../util/json.c
multi_pmem_LDADD = \
$(LIBNDCTL_LIB) \
$(JSON_LIBS) \
diff --git a/ndctl/util/json.c b/util/json.c
similarity index 100%
rename from ndctl/util/json.c
rename to util/json.c
diff --git a/ndctl/util/json.h b/util/json.h
similarity index 100%
rename from ndctl/util/json.h
rename to util/json.h
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
