diff options
author | Jesper Dangaard Brouer <brouer@redhat.com> | 2016-04-28 15:21:09 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-29 21:25:33 +0300 |
commit | b62a796c109ca0be3e49de620a8ea8248412446d (patch) | |
tree | 94408914e03cc326e3e8764a71c72ce6a1259d43 | |
parent | 1c97566d515de2ef66873e30288b150f0154f3b3 (diff) | |
download | linux-b62a796c109ca0be3e49de620a8ea8248412446d.tar.xz |
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>
-rw-r--r-- | samples/bpf/Makefile | 8 | ||||
-rw-r--r-- | samples/bpf/README.rst | 3 |
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 # make samples/bpf/ LLC=~/git/llvm/build/bin/llc LLC ?= llc +# Trick to allow make to be run from this directory +all: + $(MAKE) -C ../../ $$PWD/ + +clean: + $(MAKE) -C ../../ M=$$PWD clean + @rm -f *~ + # Verify LLVM compiler is available and bpf target is supported .PHONY: verify_cmd_llc verify_target_bpf 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:: Do notice the "/" slash after the directory name. +It is also possible to call make from this directory. This will just +hide the the invocation of make as above with the appended "/". + Manually compiling LLVM with 'bpf' support ------------------------------------------ |