Commit 97c50589 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-bpftool-makefile-cleanups' 



Quentin Monnet says:

====================
First patch of this series cleans up the two Makefiles (Makefile and
Documentation/Makefile) and make their contents more consistent.

The second one add "uninstall" and "doc-uninstall" targets, to remove
files previously installed on the system with "install" and "doc-install"
targets.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 62cd2770 d3244248

tools/bpf/bpftool/Documentation/Makefile

+20 −10
Original line number Diff line number Diff line
@@ -3,12 +3,16 @@ include ../../../scripts/utilities.mak 


INSTALL ?= install

RM ?= rm -f

RMDIR ?= rmdir --ignore-fail-on-non-empty



# Make the path relative to DESTDIR, not prefix

ifndef DESTDIR

prefix ?= /usr/local

ifeq ($(V),1)

  Q =

else

  Q = @

endif

mandir ?= $(prefix)/share/man



prefix ?= /usr/local

mandir ?= $(prefix)/man

man8dir = $(mandir)/man8



MAN8_RST = $(wildcard *.rst)
@@ -20,15 +24,21 @@ man: man8 
man8: $(DOC_MAN8)



$(OUTPUT)%.8: %.rst

	rst2man $< > $@

	$(QUIET_GEN)rst2man $< > $@



clean:

	$(call QUIET_CLEAN, Documentation) $(RM) $(DOC_MAN8)

	$(call QUIET_CLEAN, Documentation)

	$(Q)$(RM) $(DOC_MAN8)



install: man

	$(call QUIET_INSTALL, Documentation-man) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir); \

		$(INSTALL) -m 644 $(DOC_MAN8) $(DESTDIR)$(man8dir);

	$(call QUIET_INSTALL, Documentation-man)

	$(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)

	$(Q)$(INSTALL) -m 644 $(DOC_MAN8) $(DESTDIR)$(man8dir)



uninstall:

	$(call QUIET_UNINST, Documentation-man)

	$(Q)$(RM) $(addprefix $(DESTDIR)$(man8dir)/,$(_DOC_MAN8))

	$(Q)$(RMDIR) $(DESTDIR)$(man8dir)



.PHONY: man man8 clean install

.PHONY: man man8 clean install uninstall

.DEFAULT_GOAL := man

tools/bpf/bpftool/Makefile

+31 −30
Original line number Diff line number Diff line 
include ../../scripts/Makefile.include



include ../../scripts/utilities.mak



ifeq ($(srctree),)

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

#$(info Determined 'srctree' to be $(srctree))

endif



ifneq ($(objtree),)

#$(info Determined 'objtree' to be $(objtree))

endif



ifneq ($(OUTPUT),)

#$(info Determined 'OUTPUT' to be $(OUTPUT))

# Adding $(OUTPUT) as a directory to look for source files,

# because use generated output files as sources dependency

# for flex/bison parsers.

VPATH += $(OUTPUT)

export VPATH

endif



ifeq ($(V),1)
@@ -45,7 +30,7 @@ $(LIBBPF)-clean: 
	$(call QUIET_CLEAN, libbpf)

	$(Q)$(MAKE) -C $(BPF_DIR) OUTPUT=$(OUTPUT) clean >/dev/null



prefix = /usr/local

prefix ?= /usr/local

bash_compdir ?= /usr/share/bash-completion/completions



CC = gcc
@@ -55,6 +40,9 @@ CFLAGS += -W -Wall -Wextra -Wno-unused-parameter -Wshadow 
CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/tools/include/uapi -I$(srctree)/tools/include -I$(srctree)/tools/lib/bpf -I$(srctree)/kernel/bpf/

LIBS = -lelf -lbfd -lopcodes $(LIBBPF)



INSTALL ?= install

RM ?= rm -f



include $(wildcard *.d)



all: $(OUTPUT)bpftool
@@ -73,21 +61,34 @@ $(OUTPUT)%.o: %.c 


clean: $(LIBBPF)-clean

	$(call QUIET_CLEAN, bpftool)

	$(Q)rm -rf $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d

	$(Q)$(RM) $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d



install: $(OUTPUT)bpftool

	$(call QUIET_INSTALL, bpftool)

	$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(prefix)/sbin

	$(Q)$(INSTALL) $(OUTPUT)bpftool $(DESTDIR)$(prefix)/sbin/bpftool

	$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)

	$(Q)$(INSTALL) -m 0644 bash-completion/bpftool $(DESTDIR)$(bash_compdir)



install:

	install -m 0755 -d $(prefix)/sbin

	install $(OUTPUT)bpftool $(prefix)/sbin/bpftool

	install -m 0755 -d $(bash_compdir)

	install -m 0644 bash-completion/bpftool $(bash_compdir)

uninstall:

	$(call QUIET_UNINST, bpftool)

	$(Q)$(RM) $(DESTDIR)$(prefix)/sbin/bpftool

	$(Q)$(RM) $(DESTDIR)$(bash_compdir)/bpftool



doc:

	$(Q)$(MAKE) -C Documentation/

	$(call descend,Documentation)



doc-clean:

	$(call descend,Documentation,clean)



doc-install:

	$(Q)$(MAKE) -C Documentation/ install

	$(call descend,Documentation,install)



doc-uninstall:

	$(call descend,Documentation,uninstall)



FORCE:



.PHONY: all clean FORCE install doc doc-install

.PHONY: all FORCE clean install uninstall

.PHONY: doc doc-clean doc-install doc-uninstall

.DEFAULT_GOAL := all

tools/scripts/Makefile.include

+1 −0
Original line number Diff line number Diff line
@@ -99,5 +99,6 @@ ifneq ($(silent),1) 


	QUIET_CLEAN    = @printf '  CLEAN    %s\n' $1;

	QUIET_INSTALL  = @printf '  INSTALL  %s\n' $1;

	QUIET_UNINST   = @printf '  UNINST   %s\n' $1;

  endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE