aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2014-04-01 11:42:18 -0400
committerSasha Levin <sasha.levin@oracle.com>2014-04-01 11:46:10 -0400
commitbe227b45fb228adff4371b8de9e3989904209ff4 (patch)
tree1ad6b18a2033b452f6453b3a6c8ef27f231f5c56 /tools/lib
parent95f75476b9a8841c7070301305fbcd437d07c40c (diff)
tools/liblockdep: Add proper versioning to the shared obj
Add proper versioning to the shared obj so that distros would be able to ship this lib without having to worry about versioning. Suggested-by: Josh Boyer <jwboyer@fedoraproject.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/lockdep/Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 07b0b7542511..cb09d3ff8f58 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -1,13 +1,8 @@
1# liblockdep version
2LL_VERSION = 0
3LL_PATCHLEVEL = 0
4LL_EXTRAVERSION = 1
5
6# file format version 1# file format version
7FILE_VERSION = 1 2FILE_VERSION = 1
8 3
9MAKEFLAGS += --no-print-directory 4MAKEFLAGS += --no-print-directory
10 5LIBLOCKDEP_VERSION=$(shell make -sC ../../.. kernelversion)
11 6
12# Makefiles suck: This macro sets a default value of $(2) for the 7# Makefiles suck: This macro sets a default value of $(2) for the
13# variable named by $(1), unless the variable has been set by 8# variable named by $(1), unless the variable has been set by
@@ -98,7 +93,7 @@ export prefix libdir bindir src obj
98libdir_SQ = $(subst ','\'',$(libdir)) 93libdir_SQ = $(subst ','\'',$(libdir))
99bindir_SQ = $(subst ','\'',$(bindir)) 94bindir_SQ = $(subst ','\'',$(bindir))
100 95
101LIB_FILE = liblockdep.a liblockdep.so 96LIB_FILE = liblockdep.a liblockdep.so.$(LIBLOCKDEP_VERSION)
102BIN_FILE = lockdep 97BIN_FILE = lockdep
103 98
104CONFIG_INCLUDES = 99CONFIG_INCLUDES =
@@ -110,8 +105,6 @@ N =
110 105
111export Q VERBOSE 106export Q VERBOSE
112 107
113LIBLOCKDEP_VERSION = $(LL_VERSION).$(LL_PATCHLEVEL).$(LL_EXTRAVERSION)
114
115INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES) 108INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES)
116 109
117# Set compile option CFLAGS if not set elsewhere 110# Set compile option CFLAGS if not set elsewhere
@@ -146,7 +139,7 @@ do_app_build = \
146 139
147do_compile_shared_library = \ 140do_compile_shared_library = \
148 ($(print_shared_lib_compile) \ 141 ($(print_shared_lib_compile) \
149 $(CC) --shared $^ -o $@ -lpthread -ldl) 142 $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -s $@ liblockdep.so))
150 143
151do_build_static_lib = \ 144do_build_static_lib = \
152 ($(print_static_lib_build) \ 145 ($(print_static_lib_build) \
@@ -177,7 +170,7 @@ all: all_cmd
177 170
178all_cmd: $(CMD_TARGETS) 171all_cmd: $(CMD_TARGETS)
179 172
180liblockdep.so: $(PEVENT_LIB_OBJS) 173liblockdep.so.$(LIBLOCKDEP_VERSION): $(PEVENT_LIB_OBJS)
181 $(Q)$(do_compile_shared_library) 174 $(Q)$(do_compile_shared_library)
182 175
183liblockdep.a: $(PEVENT_LIB_OBJS) 176liblockdep.a: $(PEVENT_LIB_OBJS)