|
21 | 21 | libbpf
|
22 | 22 | --- src/Makefile
|
23 | 23 | +++ src/Makefile
|
24 |
| -@@ -1,10 +1,8 @@ |
| 24 | +@@ -1,13 +1,11 @@ |
25 | 25 | # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
26 | 26 | -include ../../scripts/Makefile.include
|
27 | 27 | +include Makefile.include
|
|
32 | 32 | -srctree := $(patsubst %/,%,$(dir $(srctree)))
|
33 | 33 | endif
|
34 | 34 |
|
35 |
| - ifeq ($(V),1) |
36 |
| -@@ -13,7 +11,7 @@ |
37 |
| - Q = @ |
38 |
| - endif |
39 |
| - |
40 | 35 | -BPF_DIR = $(srctree)/tools/lib/bpf
|
41 | 36 | +BPF_DIR = $(srctree)/libbpf/src
|
42 | 37 |
|
43 | 38 | ifneq ($(OUTPUT),)
|
44 | 39 | _OUTPUT := $(OUTPUT)
|
45 |
| -@@ -43,16 +41,16 @@ |
| 40 | +@@ -37,16 +35,16 @@ |
46 | 41 | $(QUIET_MKDIR)mkdir -p $@
|
47 | 42 |
|
48 | 43 | $(LIBBPF): $(wildcard $(BPF_DIR)/*.[ch] $(BPF_DIR)/Makefile) | $(LIBBPF_OUTPUT)
|
|
63 | 58 | ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" $@ install_headers
|
64 | 59 |
|
65 | 60 | $(LIBBPF_BOOTSTRAP_INTERNAL_HDRS): $(LIBBPF_BOOTSTRAP_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_BOOTSTRAP_HDRS_DIR)
|
66 |
| -@@ -76,9 +74,9 @@ |
| 61 | +@@ -75,9 +73,9 @@ |
67 | 62 | CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
|
68 | 63 | -I$(or $(OUTPUT),.) \
|
69 | 64 | -I$(LIBBPF_INCLUDE) \
|
|
89 | 84 | endif
|
90 | 85 |
|
91 | 86 | LIBS = $(LIBBPF) -lelf -lz
|
92 |
| -@@ -214,7 +208,7 @@ |
| 87 | +@@ -225,7 +219,7 @@ |
93 | 88 | $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)
|
94 | 89 | $(QUIET_CLANG)$(CLANG) \
|
95 | 90 | -I$(or $(OUTPUT),.) \
|
|
98 | 93 | -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
|
99 | 94 | -g -O2 -Wall -fno-stack-protector \
|
100 | 95 | --target=bpf -c $< -o $@
|
101 |
| -@@ -232,7 +226,7 @@ |
| 96 | +@@ -243,7 +237,7 @@ |
102 | 97 |
|
103 | 98 | CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
|
104 | 99 |
|
|
107 | 102 | $(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
|
108 | 103 |
|
109 | 104 | $(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP)
|
110 |
| -@@ -251,7 +245,7 @@ |
| 105 | +@@ -262,7 +256,7 @@ |
111 | 106 | $(call QUIET_CLEAN, feature-detect)
|
112 | 107 | $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
|
113 | 108 |
|
|
116 | 111 | $(call QUIET_CLEAN, bpftool)
|
117 | 112 | $(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
|
118 | 113 | $(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
|
119 |
| -@@ -267,7 +261,7 @@ |
| 114 | +@@ -278,7 +272,7 @@ |
120 | 115 |
|
121 | 116 | install: install-bin
|
122 | 117 | $(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
|
|
125 | 120 |
|
126 | 121 | uninstall:
|
127 | 122 | $(call QUIET_UNINST, bpftool)
|
128 |
| -@@ -275,16 +269,16 @@ |
| 123 | +@@ -286,16 +280,16 @@ |
129 | 124 | $(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool
|
130 | 125 |
|
131 | 126 | doc:
|
|
0 commit comments