Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools lib api: Rename libapikfs.a to libapi.a

Renaming libapikfs.a to libapi.a, because it's not just 'fs' specific
library now.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Will 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-g1mk5oj2ayq4vn653ovfg3gv@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
285a8f24 b4f91668

+21 -21
+2 -2
tools/lib/api/Build
··· 1 - libapikfs-y += fd/ 2 - libapikfs-y += fs/ 1 + libapi-y += fd/ 2 + libapi-y += fs/
+4 -4
tools/lib/api/Makefile
··· 13 13 14 14 MAKEFLAGS += --no-print-directory 15 15 16 - LIBFILE = $(OUTPUT)libapikfs.a 16 + LIBFILE = $(OUTPUT)libapi.a 17 17 18 18 CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) 19 19 CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 -fPIC ··· 22 22 RM = rm -f 23 23 24 24 build := -f $(srctree)/tools/build/Makefile.build dir=. obj 25 - API_IN := $(OUTPUT)libapikfs-in.o 25 + API_IN := $(OUTPUT)libapi-in.o 26 26 27 27 export srctree OUTPUT CC LD CFLAGS V 28 28 29 29 all: $(LIBFILE) 30 30 31 31 $(API_IN): FORCE 32 - @$(MAKE) $(build)=libapikfs 32 + @$(MAKE) $(build)=libapi 33 33 34 34 $(LIBFILE): $(API_IN) 35 35 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN) 36 36 37 37 clean: 38 - $(call QUIET_CLEAN, libapikfs) $(RM) $(LIBFILE); \ 38 + $(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \ 39 39 find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM) 40 40 41 41 FORCE:
+1 -1
tools/lib/api/fd/Build
··· 1 - libapikfs-y += array.o 1 + libapi-y += array.o
+4 -4
tools/lib/api/fs/Build
··· 1 - libapikfs-y += fs.o 2 - libapikfs-y += findfs.o 3 - libapikfs-y += debugfs.o 4 - libapikfs-y += tracefs.o 1 + libapi-y += fs.o 2 + libapi-y += debugfs.o 3 + libapi-y += findfs.o 4 + libapi-y += tracefs.o
+9 -9
tools/perf/Makefile.perf
··· 161 161 LIBTRACEEVENT = $(TE_PATH)libtraceevent.a 162 162 export LIBTRACEEVENT 163 163 164 - LIBAPIKFS = $(LIB_PATH)libapikfs.a 165 - export LIBAPIKFS 164 + LIBAPI = $(LIB_PATH)libapi.a 165 + export LIBAPI 166 166 167 167 # python extension build directories 168 168 PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/ ··· 173 173 python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so 174 174 175 175 PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) 176 - PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPIKFS) 176 + PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI) 177 177 178 178 $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) 179 179 $(QUIET_GEN)CFLAGS='$(CFLAGS)' $(PYTHON_WORD) util/setup.py \ ··· 214 214 215 215 LIB_FILE=$(OUTPUT)libperf.a 216 216 217 - PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT) 217 + PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) 218 218 219 219 # We choose to avoid "if .. else if .. else .. endif endif" 220 220 # because maintaining the nesting to match is a pain. If ··· 375 375 install-traceevent-plugins: $(LIBTRACEEVENT) 376 376 $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins 377 377 378 - $(LIBAPIKFS): FORCE 379 - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapikfs.a 378 + $(LIBAPI): FORCE 379 + @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a 380 380 381 - $(LIBAPIKFS)-clean: 382 - $(call QUIET_CLEAN, libapikfs) 381 + $(LIBAPI)-clean: 382 + $(call QUIET_CLEAN, libapi) 383 383 @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null 384 384 385 385 help: ··· 520 520 $(call QUIET_CLEAN, config) 521 521 @$(MAKE) -C config/feature-checks clean >/dev/null 522 522 523 - clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean 523 + clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean 524 524 $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) 525 525 @find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 526 526 @$(RM) .config-detected
+1 -1
tools/perf/util/setup.py
··· 25 25 build_lib = getenv('PYTHON_EXTBUILD_LIB') 26 26 build_tmp = getenv('PYTHON_EXTBUILD_TMP') 27 27 libtraceevent = getenv('LIBTRACEEVENT') 28 - libapikfs = getenv('LIBAPIKFS') 28 + libapikfs = getenv('LIBAPI') 29 29 30 30 ext_sources = [f.strip() for f in file('util/python-ext-sources') 31 31 if len(f.strip()) > 0 and f[0] != '#']