aboutsummaryrefslogtreecommitdiffstats
path: root/samples/bpf
diff options
context:
space:
mode:
authorJesper Dangaard Brouer <brouer@redhat.com>2016-04-28 08:21:09 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-29 14:25:33 -0400
commitb62a796c109ca0be3e49de620a8ea8248412446d (patch)
tree94408914e03cc326e3e8764a71c72ce6a1259d43 /samples/bpf
parent1c97566d515de2ef66873e30288b150f0154f3b3 (diff)
samples/bpf: allow make to be run from samples/bpf/ directory
It is not intuitive that 'make' must be run from the top level directory with argument "samples/bpf/" to compile these eBPF samples. Introduce a kbuild make file trick that allow make to be run from the "samples/bpf/" directory itself. It basically change to the top level directory and call "make samples/bpf/" with the "/" slash after the directory name. Also add a clean target that only cleans this directory, by taking advantage of the kbuild external module setting M=$PWD. Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf')
-rw-r--r--samples/bpf/Makefile8
-rw-r--r--samples/bpf/README.rst3
2 files changed, 11 insertions, 0 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index 45859c99f573..dd63521832d8 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -85,6 +85,14 @@ HOSTLOADLIBES_test_overhead += -lelf -lrt
85# make samples/bpf/ LLC=~/git/llvm/build/bin/llc 85# make samples/bpf/ LLC=~/git/llvm/build/bin/llc
86LLC ?= llc 86LLC ?= llc
87 87
88# Trick to allow make to be run from this directory
89all:
90 $(MAKE) -C ../../ $$PWD/
91
92clean:
93 $(MAKE) -C ../../ M=$$PWD clean
94 @rm -f *~
95
88# Verify LLVM compiler is available and bpf target is supported 96# Verify LLVM compiler is available and bpf target is supported
89.PHONY: verify_cmd_llc verify_target_bpf 97.PHONY: verify_cmd_llc verify_target_bpf
90 98
diff --git a/samples/bpf/README.rst b/samples/bpf/README.rst
index 6f133f3f0075..e36687d900c8 100644
--- a/samples/bpf/README.rst
+++ b/samples/bpf/README.rst
@@ -36,6 +36,9 @@ top level directory::
36 36
37Do notice the "/" slash after the directory name. 37Do notice the "/" slash after the directory name.
38 38
39It is also possible to call make from this directory. This will just
40hide the the invocation of make as above with the appended "/".
41
39Manually compiling LLVM with 'bpf' support 42Manually compiling LLVM with 'bpf' support
40------------------------------------------ 43------------------------------------------
41 44