diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2015-01-10 14:53:13 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-12 15:55:18 -0500 |
| commit | 285a8f247b08c2aff83633fb82c217f91455d10b (patch) | |
| tree | 4ed7e7481e12f97008c5a232abb64f0062fa2dff /tools/lib/api | |
| parent | b4f9166847354cb839c275c062c6b17afba49211 (diff) | |
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>
Diffstat (limited to 'tools/lib/api')
| -rw-r--r-- | tools/lib/api/Build | 4 | ||||
| -rw-r--r-- | tools/lib/api/Makefile | 8 | ||||
| -rw-r--r-- | tools/lib/api/fd/Build | 2 | ||||
| -rw-r--r-- | tools/lib/api/fs/Build | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/tools/lib/api/Build b/tools/lib/api/Build index 64dd8d466d2c..3653965cf481 100644 --- a/tools/lib/api/Build +++ b/tools/lib/api/Build | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | libapikfs-y += fd/ | 1 | libapi-y += fd/ |
| 2 | libapikfs-y += fs/ | 2 | libapi-y += fs/ |
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile index 1aa47c271313..d8fe29fc19a4 100644 --- a/tools/lib/api/Makefile +++ b/tools/lib/api/Makefile | |||
| @@ -13,7 +13,7 @@ AR = $(CROSS_COMPILE)ar | |||
| 13 | 13 | ||
| 14 | MAKEFLAGS += --no-print-directory | 14 | MAKEFLAGS += --no-print-directory |
| 15 | 15 | ||
| 16 | LIBFILE = $(OUTPUT)libapikfs.a | 16 | LIBFILE = $(OUTPUT)libapi.a |
| 17 | 17 | ||
| 18 | CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) | 18 | CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) |
| 19 | CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 -fPIC | 19 | 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 | |||
| 22 | RM = rm -f | 22 | RM = rm -f |
| 23 | 23 | ||
| 24 | build := -f $(srctree)/tools/build/Makefile.build dir=. obj | 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 | export srctree OUTPUT CC LD CFLAGS V | 27 | export srctree OUTPUT CC LD CFLAGS V |
| 28 | 28 | ||
| 29 | all: $(LIBFILE) | 29 | all: $(LIBFILE) |
| 30 | 30 | ||
| 31 | $(API_IN): FORCE | 31 | $(API_IN): FORCE |
| 32 | @$(MAKE) $(build)=libapikfs | 32 | @$(MAKE) $(build)=libapi |
| 33 | 33 | ||
| 34 | $(LIBFILE): $(API_IN) | 34 | $(LIBFILE): $(API_IN) |
| 35 | $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN) | 35 | $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN) |
| 36 | 36 | ||
| 37 | clean: | 37 | clean: |
| 38 | $(call QUIET_CLEAN, libapikfs) $(RM) $(LIBFILE); \ | 38 | $(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \ |
| 39 | find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM) | 39 | find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM) |
| 40 | 40 | ||
| 41 | FORCE: | 41 | FORCE: |
diff --git a/tools/lib/api/fd/Build b/tools/lib/api/fd/Build index 4ddcb0ff7f49..605d99f6d71a 100644 --- a/tools/lib/api/fd/Build +++ b/tools/lib/api/fd/Build | |||
| @@ -1 +1 @@ | |||
| libapikfs-y += array.o | libapi-y += array.o | ||
diff --git a/tools/lib/api/fs/Build b/tools/lib/api/fs/Build index 5f0fe4dfaae6..6de5a4f0b501 100644 --- a/tools/lib/api/fs/Build +++ b/tools/lib/api/fs/Build | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | libapikfs-y += fs.o | 1 | libapi-y += fs.o |
| 2 | libapikfs-y += findfs.o | 2 | libapi-y += debugfs.o |
| 3 | libapikfs-y += debugfs.o | 3 | libapi-y += findfs.o |
| 4 | libapikfs-y += tracefs.o | 4 | libapi-y += tracefs.o |
