diff options
| author | Kamal Mostafa <kamal@canonical.com> | 2015-11-11 14:24:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-15 17:24:33 -0500 |
| commit | d7475de58575c904818efa369c82e88c6648ce2e (patch) | |
| tree | aaf61afae394621ab3a083a24b759fdffb05000c /tools | |
| parent | e63e904c629ac7c092b17328aeed88ca6e437ed3 (diff) | |
| download | op-kernel-dev-d7475de58575c904818efa369c82e88c6648ce2e.zip op-kernel-dev-d7475de58575c904818efa369c82e88c6648ce2e.tar.gz | |
tools/net: Use include/uapi with __EXPORTED_HEADERS__
Use the local uapi headers to keep in sync with "recently" added #define's
(e.g. SKF_AD_VLAN_TPID). Refactored CFLAGS, and bpf_asm doesn't need -I.
Fixes: 3f356385e8a4 ("filter: bpf_asm: add minimal bpf asm tool")
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/net/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/net/Makefile b/tools/net/Makefile index ee577ea..ddf8880 100644 --- a/tools/net/Makefile +++ b/tools/net/Makefile @@ -4,6 +4,9 @@ CC = gcc LEX = flex YACC = bison +CFLAGS += -Wall -O2 +CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include + %.yacc.c: %.y $(YACC) -o $@ -d $< @@ -12,15 +15,13 @@ YACC = bison all : bpf_jit_disasm bpf_dbg bpf_asm -bpf_jit_disasm : CFLAGS = -Wall -O2 -DPACKAGE='bpf_jit_disasm' +bpf_jit_disasm : CFLAGS += -DPACKAGE='bpf_jit_disasm' bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl bpf_jit_disasm : bpf_jit_disasm.o -bpf_dbg : CFLAGS = -Wall -O2 bpf_dbg : LDLIBS = -lreadline bpf_dbg : bpf_dbg.o -bpf_asm : CFLAGS = -Wall -O2 -I. bpf_asm : LDLIBS = bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o bpf_exp.lex.o : bpf_exp.yacc.c |
