tools/net: Use include/uapi with __EXPORTED_HEADERS__ (d7475de5) · Commits · 戴 / test

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: ("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>

tools/net/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -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

Admin message