From: Jiri Benc <jbenc@redhat.com>
To: netdev@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Subject: [PATCH bpf-next 2/7] tools: bpf: respect output directory during build
Date: Thu, 8 Mar 2018 23:00:36 +0100 [thread overview]
Message-ID: <9daa33b47d5e7aeef89acd5e7ecaf75b7cf23713.1520545951.git.jbenc@redhat.com> (raw)
In-Reply-To: <cover.1520545951.git.jbenc@redhat.com>
Currently, the programs under tools/bpf (with the notable exception of
bpftool) do not respect the output directory (make O=dir). Fix that.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
---
tools/bpf/Makefile | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile
index c8ec0ae16bf0..e7b15967492e 100644
--- a/tools/bpf/Makefile
+++ b/tools/bpf/Makefile
@@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
+include ../scripts/Makefile.include
+
prefix = /usr
CC = gcc
@@ -7,7 +9,7 @@ YACC = bison
MAKE = make
CFLAGS += -Wall -O2
-CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
+CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/include/uapi -I$(srctree)/include
ifeq ($(srctree),)
srctree := $(patsubst %/,%,$(dir $(CURDIR)))
@@ -38,32 +40,36 @@ ifeq ($(feature-disassembler-four-args), 1)
CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
endif
-%.yacc.c: %.y
+$(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y
$(YACC) -o $@ -d $<
-%.lex.c: %.l
+$(OUTPUT)%.lex.c: $(srctree)/tools/bpf/%.l
$(LEX) -o $@ $<
-all: bpf_jit_disasm bpf_dbg bpf_asm bpftool
+$(OUTPUT)%.o: $(srctree)/tools/bpf/%.c
+ $(COMPILE.c) -o $@ $<
+
+all: $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg $(OUTPUT)bpf_asm bpftool
-bpf_jit_disasm : CFLAGS += -DPACKAGE='bpf_jit_disasm'
-bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl
-bpf_jit_disasm : bpf_jit_disasm.o
+$(OUTPUT)bpf_jit_disasm: CFLAGS += -DPACKAGE='bpf_jit_disasm'
+$(OUTPUT)bpf_jit_disasm: LDLIBS = -lopcodes -lbfd -ldl
+$(OUTPUT)bpf_jit_disasm: $(OUTPUT)bpf_jit_disasm.o
-bpf_dbg : LDLIBS = -lreadline
-bpf_dbg : bpf_dbg.o
+$(OUTPUT)bpf_dbg: LDLIBS = -lreadline
+$(OUTPUT)bpf_dbg: $(OUTPUT)bpf_dbg.o
-bpf_asm : LDLIBS =
-bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o
-bpf_exp.lex.o : bpf_exp.yacc.c
+$(OUTPUT)bpf_asm: LDLIBS =
+$(OUTPUT)bpf_asm: $(OUTPUT)bpf_asm.o $(OUTPUT)bpf_exp.yacc.o $(OUTPUT)bpf_exp.lex.o
+$(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.yacc.c
clean: bpftool_clean
- rm -rf *.o bpf_jit_disasm bpf_dbg bpf_asm bpf_exp.yacc.* bpf_exp.lex.*
+ rm -rf $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \
+ $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*
install: bpftool_install
- install bpf_jit_disasm $(prefix)/bin/bpf_jit_disasm
- install bpf_dbg $(prefix)/bin/bpf_dbg
- install bpf_asm $(prefix)/bin/bpf_asm
+ install $(OUTPUT)bpf_jit_disasm $(prefix)/bin/bpf_jit_disasm
+ install $(OUTPUT)bpf_dbg $(prefix)/bin/bpf_dbg
+ install $(OUTPUT)bpf_asm $(prefix)/bin/bpf_asm
bpftool:
$(MAKE) -C bpftool
--
1.8.3.1
next prev parent reply other threads:[~2018-03-08 22:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-08 22:00 [PATCH bpf-next 0/7] tools: bpf: standardize make Jiri Benc
2018-03-08 22:00 ` [PATCH bpf-next 1/7] tools: bpftool: silence 'missing initializer' warnings Jiri Benc
2018-03-09 7:38 ` Jakub Kicinski
2018-03-09 8:42 ` Jiri Benc
2018-03-08 22:00 ` Jiri Benc [this message]
2018-03-08 22:00 ` [PATCH bpf-next 3/7] tools: bpf: consistent make bpf_install Jiri Benc
2018-03-08 22:00 ` [PATCH bpf-next 4/7] tools: bpf: make install should build first Jiri Benc
2018-03-08 22:00 ` [PATCH bpf-next 5/7] tools: bpf: call descend in Makefile Jiri Benc
2018-03-08 22:00 ` [PATCH bpf-next 6/7] tools: bpf: respect quiet/verbose build Jiri Benc
2018-03-08 22:00 ` [PATCH bpf-next 7/7] tools: bpf: silence make by not deleting intermediate file Jiri Benc
2018-03-09 5:10 ` [PATCH bpf-next 0/7] tools: bpf: standardize make Alexei Starovoitov
2018-03-09 7:36 ` Jakub Kicinski
2018-03-09 9:29 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9daa33b47d5e7aeef89acd5e7ecaf75b7cf23713.1520545951.git.jbenc@redhat.com \
--to=jbenc@redhat.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).