Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c422f55 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

tools build: Build fixdep helper from perf and basic libs 



Adding the fixdep target into the Makefile.include to ease up building of
fixdep helper, that needs to be built before we dive in to the build itself.
The user can invoke the fixdep target to build the helper.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1443004442-32660-8-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 324c824a

tools/build/Documentation/Build.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,13 @@ It defines following interface: 
      make $(build)=ex

      make $(build)=ex









Fixdep

------

It is necessary to build the fixdep helper before invoking the build.

The Makefile.include file adds the fixdep target, that could be

invoked by the user.





Rules

Rules

-----

-----

tools/build/Makefile.include

+5 −0
Original line number Original line Diff line number Diff line 
build := -f $(srctree)/tools/build/Makefile.build dir=. obj

build := -f $(srctree)/tools/build/Makefile.build dir=. obj



fixdep:

	$(Q)$(MAKE) -C $(srctree)/tools/build fixdep



.PHONY: fixdep

tools/build/tests/ex/Makefile

+5 −3
Original line number Original line Diff line number Diff line
@@ -3,18 +3,20 @@ export CC := gcc 
export LD      := ld

export LD      := ld

export AR      := ar

export AR      := ar





ex:



include $(srctree)/tools/build/Makefile.include

include $(srctree)/tools/build/Makefile.include





ex: ex-in.o libex-in.o

ex: ex-in.o libex-in.o

	gcc -o $@ $^

	gcc -o $@ $^





ex.%: FORCE

ex.%: fixdep FORCE

	make -f $(srctree)/tools/build/Makefile.build dir=. $@

	make -f $(srctree)/tools/build/Makefile.build dir=. $@





ex-in.o: FORCE

ex-in.o: fixdep FORCE

	make $(build)=ex

	make $(build)=ex





libex-in.o: FORCE

libex-in.o: fixdep FORCE

	make $(build)=libex

	make $(build)=libex





clean:

clean:

tools/lib/api/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -23,10 +23,12 @@ RM = rm -f 




API_IN := $(OUTPUT)libapi-in.o

API_IN := $(OUTPUT)libapi-in.o





all:



export srctree OUTPUT CC LD CFLAGS V

export srctree OUTPUT CC LD CFLAGS V

include $(srctree)/tools/build/Makefile.include

include $(srctree)/tools/build/Makefile.include





all: $(LIBFILE)

all: fixdep $(LIBFILE)





$(API_IN): FORCE

$(API_IN): FORCE

	@$(MAKE) $(build)=libapi

	@$(MAKE) $(build)=libapi

tools/lib/bpf/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -123,6 +123,8 @@ endif 
# the same command line setup.

# the same command line setup.

MAKEOVERRIDES=

MAKEOVERRIDES=





all:



export srctree OUTPUT CC LD CFLAGS V

export srctree OUTPUT CC LD CFLAGS V

include $(srctree)/tools/build/Makefile.include

include $(srctree)/tools/build/Makefile.include
@@ -133,7 +135,7 @@ CMD_TARGETS = $(LIB_FILE) 




TARGETS = $(CMD_TARGETS)

TARGETS = $(CMD_TARGETS)





all: $(VERSION_FILES) all_cmd

all: fixdep $(VERSION_FILES) all_cmd





all_cmd: $(CMD_TARGETS)

all_cmd: $(CMD_TARGETS)