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>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
b4f9166847
commit
285a8f247b
@ -1,2 +1,2 @@
|
|||||||
libapikfs-y += fd/
|
libapi-y += fd/
|
||||||
libapikfs-y += fs/
|
libapi-y += fs/
|
||||||
|
@ -13,7 +13,7 @@ AR = $(CROSS_COMPILE)ar
|
|||||||
|
|
||||||
MAKEFLAGS += --no-print-directory
|
MAKEFLAGS += --no-print-directory
|
||||||
|
|
||||||
LIBFILE = $(OUTPUT)libapikfs.a
|
LIBFILE = $(OUTPUT)libapi.a
|
||||||
|
|
||||||
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
|
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
|
||||||
CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 -fPIC
|
CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 -fPIC
|
||||||
@ -22,20 +22,20 @@ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|||||||
RM = rm -f
|
RM = rm -f
|
||||||
|
|
||||||
build := -f $(srctree)/tools/build/Makefile.build dir=. obj
|
build := -f $(srctree)/tools/build/Makefile.build dir=. obj
|
||||||
API_IN := $(OUTPUT)libapikfs-in.o
|
API_IN := $(OUTPUT)libapi-in.o
|
||||||
|
|
||||||
export srctree OUTPUT CC LD CFLAGS V
|
export srctree OUTPUT CC LD CFLAGS V
|
||||||
|
|
||||||
all: $(LIBFILE)
|
all: $(LIBFILE)
|
||||||
|
|
||||||
$(API_IN): FORCE
|
$(API_IN): FORCE
|
||||||
@$(MAKE) $(build)=libapikfs
|
@$(MAKE) $(build)=libapi
|
||||||
|
|
||||||
$(LIBFILE): $(API_IN)
|
$(LIBFILE): $(API_IN)
|
||||||
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN)
|
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call QUIET_CLEAN, libapikfs) $(RM) $(LIBFILE); \
|
$(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \
|
||||||
find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)
|
find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)
|
||||||
|
|
||||||
FORCE:
|
FORCE:
|
||||||
|
@ -1 +1 @@
|
|||||||
libapikfs-y += array.o
|
libapi-y += array.o
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
libapikfs-y += fs.o
|
libapi-y += fs.o
|
||||||
libapikfs-y += findfs.o
|
libapi-y += debugfs.o
|
||||||
libapikfs-y += debugfs.o
|
libapi-y += findfs.o
|
||||||
libapikfs-y += tracefs.o
|
libapi-y += tracefs.o
|
||||||
|
@ -161,8 +161,8 @@ endif
|
|||||||
LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
|
LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
|
||||||
export LIBTRACEEVENT
|
export LIBTRACEEVENT
|
||||||
|
|
||||||
LIBAPIKFS = $(LIB_PATH)libapikfs.a
|
LIBAPI = $(LIB_PATH)libapi.a
|
||||||
export LIBAPIKFS
|
export LIBAPI
|
||||||
|
|
||||||
# python extension build directories
|
# python extension build directories
|
||||||
PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/
|
PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/
|
||||||
@ -173,7 +173,7 @@ export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP
|
|||||||
python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so
|
python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so
|
||||||
|
|
||||||
PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)
|
PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)
|
||||||
PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPIKFS)
|
PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI)
|
||||||
|
|
||||||
$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
|
$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
|
||||||
$(QUIET_GEN)CFLAGS='$(CFLAGS)' $(PYTHON_WORD) util/setup.py \
|
$(QUIET_GEN)CFLAGS='$(CFLAGS)' $(PYTHON_WORD) util/setup.py \
|
||||||
@ -214,7 +214,7 @@ export PERL_PATH
|
|||||||
|
|
||||||
LIB_FILE=$(OUTPUT)libperf.a
|
LIB_FILE=$(OUTPUT)libperf.a
|
||||||
|
|
||||||
PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT)
|
PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT)
|
||||||
|
|
||||||
# We choose to avoid "if .. else if .. else .. endif endif"
|
# We choose to avoid "if .. else if .. else .. endif endif"
|
||||||
# because maintaining the nesting to match is a pain. If
|
# because maintaining the nesting to match is a pain. If
|
||||||
@ -375,11 +375,11 @@ $(LIBTRACEEVENT)-clean:
|
|||||||
install-traceevent-plugins: $(LIBTRACEEVENT)
|
install-traceevent-plugins: $(LIBTRACEEVENT)
|
||||||
$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins
|
$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins
|
||||||
|
|
||||||
$(LIBAPIKFS): FORCE
|
$(LIBAPI): FORCE
|
||||||
@$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapikfs.a
|
@$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a
|
||||||
|
|
||||||
$(LIBAPIKFS)-clean:
|
$(LIBAPI)-clean:
|
||||||
$(call QUIET_CLEAN, libapikfs)
|
$(call QUIET_CLEAN, libapi)
|
||||||
@$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null
|
@$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null
|
||||||
|
|
||||||
help:
|
help:
|
||||||
@ -520,7 +520,7 @@ config-clean:
|
|||||||
$(call QUIET_CLEAN, config)
|
$(call QUIET_CLEAN, config)
|
||||||
@$(MAKE) -C config/feature-checks clean >/dev/null
|
@$(MAKE) -C config/feature-checks clean >/dev/null
|
||||||
|
|
||||||
clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean
|
clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean
|
||||||
$(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
|
$(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
|
||||||
@find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
|
@find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
|
||||||
@$(RM) .config-detected
|
@$(RM) .config-detected
|
||||||
|
@ -25,7 +25,7 @@ cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter'
|
|||||||
build_lib = getenv('PYTHON_EXTBUILD_LIB')
|
build_lib = getenv('PYTHON_EXTBUILD_LIB')
|
||||||
build_tmp = getenv('PYTHON_EXTBUILD_TMP')
|
build_tmp = getenv('PYTHON_EXTBUILD_TMP')
|
||||||
libtraceevent = getenv('LIBTRACEEVENT')
|
libtraceevent = getenv('LIBTRACEEVENT')
|
||||||
libapikfs = getenv('LIBAPIKFS')
|
libapikfs = getenv('LIBAPI')
|
||||||
|
|
||||||
ext_sources = [f.strip() for f in file('util/python-ext-sources')
|
ext_sources = [f.strip() for f in file('util/python-ext-sources')
|
||||||
if len(f.strip()) > 0 and f[0] != '#']
|
if len(f.strip()) > 0 and f[0] != '#']
|
||||||
|
Reference in New Issue
Block a user