[PATCH] build: Include Mesh JSON files unconditionally in EXTRA_DIST

DORMANTno replies

From: Johan Hedberg <hidden>
Date: 2018-03-08 13:01:13
Subsystem: the rest · Maintainer: Linus Torvalds

From: Johan Hedberg <redacted>

We always want the JSON files to be part of the generated tarball, and
not just when --enable-mesh has been given.
---
 Makefile.tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.tools b/Makefile.tools
index c2d81a884e7d..f7ab77de1784 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -32,9 +32,9 @@ mesh_meshctl_SOURCES = mesh/main.c \
 mesh_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
 				lib/libbluetooth-internal.la \
 				@GLIB_LIBS@ @DBUS_LIBS@ -ljson-c -lreadline
+endif
 
 EXTRA_DIST += mesh/local_node.json mesh/prov_db.json
-endif
 
 if MONITOR
 bin_PROGRAMS += monitor/btmon
-- 
2.14.3
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help