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

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

tools lib api: Use tools build framework 



Move the libapikfs library building under tools build framework.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-xjo8r7nuqy9mvlfrmx9zcfwb@git.kernel.org


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

tools/lib/api/Build

0 → 100644
+2 −0
Original line number Diff line number Diff line 
libapikfs-y += fd/

libapikfs-y += fs/

tools/lib/api/Makefile

+26 −36
Original line number Diff line number Diff line 
include ../../scripts/Makefile.include

include ../../perf/config/utilities.mak		# QUIET_CLEAN



ifeq ($(srctree),)

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

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

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

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

endif



CC = $(CROSS_COMPILE)gcc

AR = $(CROSS_COMPILE)ar



# guard against environment variables

LIB_H=

LIB_OBJS=



LIB_H += fs/debugfs.h

LIB_H += fs/tracefs.h

LIB_H += fs/findfs.h

LIB_H += fs/fs.h

# See comment below about piggybacking...

LIB_H += fd/array.h



LIB_OBJS += $(OUTPUT)fs/debugfs.o

LIB_OBJS += $(OUTPUT)fs/tracefs.o

LIB_OBJS += $(OUTPUT)fs/findfs.o

LIB_OBJS += $(OUTPUT)fs/fs.o

# XXX piggybacking here, need to introduce libapikfd, or rename this

# to plain libapik.a and make it have it all api goodies

LIB_OBJS += $(OUTPUT)fd/array.o

MAKEFLAGS += --no-print-directory



LIBFILE = libapikfs.a

LIBFILE = $(OUTPUT)libapikfs.a



CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC

EXTLIBS = -lelf -lpthread -lrt -lm

ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

ALL_LDFLAGS = $(LDFLAGS)

CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 -fPIC

CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64



RM = rm -f



$(LIBFILE): $(LIB_OBJS)

	$(QUIET_AR)$(RM) $@ && $(AR) rcs $(OUTPUT)$@ $(LIB_OBJS)

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

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



$(LIB_OBJS): $(LIB_H)

export srctree OUTPUT CC LD CFLAGS V



libapi_dirs:

	$(QUIET_MKDIR)mkdir -p $(OUTPUT)fd $(OUTPUT)fs

all: $(LIBFILE)



$(OUTPUT)%.o: %.c libapi_dirs

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $<

$(OUTPUT)%.s: %.c libapi_dirs

	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<

$(OUTPUT)%.o: %.S libapi_dirs

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $<

$(API_IN): FORCE

	@$(MAKE) $(build)=libapikfs



$(LIBFILE): $(API_IN)

	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN)



clean:

	$(call QUIET_CLEAN, libapi) $(RM) $(LIB_OBJS) $(LIBFILE)

	$(call QUIET_CLEAN, libapikfs) $(RM) $(LIBFILE); \

	find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)



FORCE:



.PHONY: clean
 
.PHONY: clean FORCE

tools/lib/api/fd/Build

0 → 100644
+1 −0
Original line number Diff line number Diff line 
libapikfs-y += array.o

tools/lib/api/fs/Build

0 → 100644
+4 −0
Original line number Diff line number Diff line 
libapikfs-y += fs.o

libapikfs-y += findfs.o

libapikfs-y += debugfs.o

libapikfs-y += tracefs.o

tools/perf/Makefile.perf

+2 −10
Original line number Diff line number Diff line
@@ -375,20 +375,12 @@ $(LIBTRACEEVENT)-clean: 
install-traceevent-plugins: $(LIBTRACEEVENT)

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins



LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch] $(LIB_PATH)fd/*.[ch])



# if subdir is set, we've been called from above so target has been built

# already

$(LIBAPIKFS): $(LIBAPIKFS_SOURCES)

ifeq ($(subdir),)

	$(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libapikfs.a

endif

$(LIBAPIKFS): FORCE

	@$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapikfs.a



$(LIBAPIKFS)-clean:

ifeq ($(subdir),)

	$(call QUIET_CLEAN, libapikfs)

	@$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null

endif



help:

	@echo 'Perf make targets:'