summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-03-31 13:11:34 (GMT)
committerMaciej Wereski <m.wereski@partner.samsung.com>2015-04-02 15:24:21 (GMT)
commitb172de7e603a2c27ace96a296c4276df7db3ba30 (patch)
treeea42a5bc3477ae3c28482875f4c2984d663a7323
parent7a5121bfa7eb7a643b4b1700c72e57590712f3cf (diff)
downloadlinux-3.10-b172de7e603a2c27ace96a296c4276df7db3ba30.zip
linux-3.10-b172de7e603a2c27ace96a296c4276df7db3ba30.tar.gz
linux-3.10-b172de7e603a2c27ace96a296c4276df7db3ba30.tar.bz2
samples: kdbus: build kdbus-workers conditionally
Give the kdbus sample its own config switch and only build it if it's explicitly switched on. Signed-off-by: Daniel Mack <daniel@zonque.org> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Reported-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--samples/Kconfig7
-rw-r--r--samples/kdbus/Makefile2
2 files changed, 8 insertions, 1 deletions
diff --git a/samples/Kconfig b/samples/Kconfig
index 6181c2c..03f7735 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -55,6 +55,13 @@ config SAMPLE_KDB
Build an example of how to dynamically add the hello
command to the kdb shell.
+config SAMPLE_KDBUS
+ bool "Build kdbus API example"
+ depends on KDBUS
+ help
+ Build an example of how the kdbus API can be used from
+ userspace.
+
config SAMPLE_RPMSG_CLIENT
tristate "Build rpmsg client sample -- loadable modules only"
depends on RPMSG && m
diff --git a/samples/kdbus/Makefile b/samples/kdbus/Makefile
index e714602..137f842 100644
--- a/samples/kdbus/Makefile
+++ b/samples/kdbus/Makefile
@@ -1,7 +1,7 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o
-hostprogs-y += kdbus-workers
+hostprogs-$(CONFIG_SAMPLE_KDBUS) += kdbus-workers
always := $(hostprogs-y)