diff options
author | Jesper Dangaard Brouer <brouer@redhat.com> | 2018-01-16 18:20:35 -0500 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-01-16 19:18:10 -0500 |
commit | 63c859101ec32cbc8fa5b708c7f17de63b15e56e (patch) | |
tree | a37ea0dfdb7fca6a3bf9c613704bda02e3094fff /tools/lib | |
parent | 7d386c624980e476612490df52eaa86c8e066edc (diff) |
libbpf: cleanup Makefile, remove unused elements
The plugin_dir_SQ variable is not used, remove it.
The function update_dir is also unused, remove it.
The variable $VERSION_FILES is empty, remove it.
These all originates from the introduction of the Makefile, and is likely a copy paste
from tools/lib/traceevent/Makefile.
Fixes: 1b76c13e4b36 ("bpf tools: Introduce 'bpf' library and add bpf feature check")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/bpf/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 54370654c708..8e15e48cb8f8 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile | |||
@@ -93,7 +93,6 @@ export prefix libdir src obj | |||
93 | # Shell quotes | 93 | # Shell quotes |
94 | libdir_SQ = $(subst ','\'',$(libdir)) | 94 | libdir_SQ = $(subst ','\'',$(libdir)) |
95 | libdir_relative_SQ = $(subst ','\'',$(libdir_relative)) | 95 | libdir_relative_SQ = $(subst ','\'',$(libdir_relative)) |
96 | plugin_dir_SQ = $(subst ','\'',$(plugin_dir)) | ||
97 | 96 | ||
98 | LIB_FILE = libbpf.a libbpf.so | 97 | LIB_FILE = libbpf.a libbpf.so |
99 | 98 | ||
@@ -150,7 +149,7 @@ CMD_TARGETS = $(LIB_FILE) | |||
150 | 149 | ||
151 | TARGETS = $(CMD_TARGETS) | 150 | TARGETS = $(CMD_TARGETS) |
152 | 151 | ||
153 | all: fixdep $(VERSION_FILES) all_cmd | 152 | all: fixdep all_cmd |
154 | 153 | ||
155 | all_cmd: $(CMD_TARGETS) | 154 | all_cmd: $(CMD_TARGETS) |
156 | 155 | ||
@@ -169,16 +168,6 @@ $(OUTPUT)libbpf.so: $(BPF_IN) | |||
169 | $(OUTPUT)libbpf.a: $(BPF_IN) | 168 | $(OUTPUT)libbpf.a: $(BPF_IN) |
170 | $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^ | 169 | $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^ |
171 | 170 | ||
172 | define update_dir | ||
173 | (echo $1 > $@.tmp; \ | ||
174 | if [ -r $@ ] && cmp -s $@ $@.tmp; then \ | ||
175 | rm -f $@.tmp; \ | ||
176 | else \ | ||
177 | echo ' UPDATE $@'; \ | ||
178 | mv -f $@.tmp $@; \ | ||
179 | fi); | ||
180 | endef | ||
181 | |||
182 | define do_install | 171 | define do_install |
183 | if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ | 172 | if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ |
184 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ | 173 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ |
@@ -204,7 +193,7 @@ config-clean: | |||
204 | $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null | 193 | $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null |
205 | 194 | ||
206 | clean: | 195 | clean: |
207 | $(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \ | 196 | $(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so .*.d .*.cmd \ |
208 | $(RM) LIBBPF-CFLAGS | 197 | $(RM) LIBBPF-CFLAGS |
209 | $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf | 198 | $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf |
210 | 199 | ||