Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
9644a96a
Commit
9644a96a
authored
Jul 27, 2015
by
Jan-Erik Rediger
Browse files
Use stable soname version
parent
2fc31e74
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
9644a96a
...
@@ -12,6 +12,7 @@ PKGCONFNAME=hiredis.pc
...
@@ -12,6 +12,7 @@ PKGCONFNAME=hiredis.pc
HIREDIS_MAJOR
=
$(
shell
grep
HIREDIS_MAJOR hiredis.h |
awk
'{print $$3
}
'
)
HIREDIS_MAJOR
=
$(
shell
grep
HIREDIS_MAJOR hiredis.h |
awk
'{print $$3
}
'
)
HIREDIS_MINOR
=
$(
shell
grep
HIREDIS_MINOR hiredis.h |
awk
'{print $$3
}
'
)
HIREDIS_MINOR
=
$(
shell
grep
HIREDIS_MINOR hiredis.h |
awk
'{print $$3
}
'
)
HIREDIS_PATCH
=
$(
shell
grep
HIREDIS_PATCH hiredis.h |
awk
'{print $$3
}
'
)
HIREDIS_PATCH
=
$(
shell
grep
HIREDIS_PATCH hiredis.h |
awk
'{print $$3
}
'
)
HIREDIS_SONAME
=
$(
shell
grep
HIREDIS_SONAME hiredis.h |
awk
'{print $$3
}
'
)
# Installation related variables and target
# Installation related variables and target
PREFIX
?=
/usr/local
PREFIX
?=
/usr/local
...
@@ -44,7 +45,7 @@ REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
...
@@ -44,7 +45,7 @@ REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
DYLIBSUFFIX
=
so
DYLIBSUFFIX
=
so
STLIBSUFFIX
=
a
STLIBSUFFIX
=
a
DYLIB_MINOR_NAME
=
$(LIBNAME)
.
$(DYLIBSUFFIX)
.
$(HIREDIS_
MAJOR)
.
$(HIREDIS_MINOR
)
DYLIB_MINOR_NAME
=
$(LIBNAME)
.
$(DYLIBSUFFIX)
.
$(HIREDIS_
SONAME
)
DYLIB_MAJOR_NAME
=
$(LIBNAME)
.
$(DYLIBSUFFIX)
.
$(HIREDIS_MAJOR)
DYLIB_MAJOR_NAME
=
$(LIBNAME)
.
$(DYLIBSUFFIX)
.
$(HIREDIS_MAJOR)
DYLIBNAME
=
$(LIBNAME)
.
$(DYLIBSUFFIX)
DYLIBNAME
=
$(LIBNAME)
.
$(DYLIBSUFFIX)
DYLIB_MAKE_CMD
=
$(CC)
-shared
-Wl
,-soname,
$(DYLIB_MINOR_NAME)
-o
$(DYLIBNAME)
$(LDFLAGS)
DYLIB_MAKE_CMD
=
$(CC)
-shared
-Wl
,-soname,
$(DYLIB_MINOR_NAME)
-o
$(DYLIBNAME)
$(LDFLAGS)
...
@@ -60,8 +61,7 @@ ifeq ($(uname_S),SunOS)
...
@@ -60,8 +61,7 @@ ifeq ($(uname_S),SunOS)
endif
endif
ifeq
($(uname_S),Darwin)
ifeq
($(uname_S),Darwin)
DYLIBSUFFIX
=
dylib
DYLIBSUFFIX
=
dylib
DYLIB_MINOR_NAME
=
$(LIBNAME)
.
$(HIREDIS_MAJOR)
.
$(HIREDIS_MINOR)
.
$(DYLIBSUFFIX)
DYLIB_MINOR_NAME
=
$(LIBNAME)
.
$(HIREDIS_SONAME)
.
$(DYLIBSUFFIX)
DYLIB_MAJOR_NAME
=
$(LIBNAME)
.
$(HIREDIS_MAJOR)
.
$(DYLIBSUFFIX)
DYLIB_MAKE_CMD
=
$(CC)
-shared
-Wl
,-install_name,
$(DYLIB_MINOR_NAME)
-o
$(DYLIBNAME)
$(LDFLAGS)
DYLIB_MAKE_CMD
=
$(CC)
-shared
-Wl
,-install_name,
$(DYLIB_MINOR_NAME)
-o
$(DYLIBNAME)
$(LDFLAGS)
endif
endif
...
@@ -164,8 +164,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
...
@@ -164,8 +164,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
mkdir
-p
$(INSTALL_INCLUDE_PATH)
$(INSTALL_LIBRARY_PATH)
mkdir
-p
$(INSTALL_INCLUDE_PATH)
$(INSTALL_LIBRARY_PATH)
$(INSTALL)
hiredis.h async.h read.h sds.h adapters
$(INSTALL_INCLUDE_PATH)
$(INSTALL)
hiredis.h async.h read.h sds.h adapters
$(INSTALL_INCLUDE_PATH)
$(INSTALL)
$(DYLIBNAME)
$(INSTALL_LIBRARY_PATH)
/
$(DYLIB_MINOR_NAME)
$(INSTALL)
$(DYLIBNAME)
$(INSTALL_LIBRARY_PATH)
/
$(DYLIB_MINOR_NAME)
cd
$(INSTALL_LIBRARY_PATH)
&&
ln
-sf
$(DYLIB_MINOR_NAME)
$(DYLIB_MAJOR_NAME)
cd
$(INSTALL_LIBRARY_PATH)
&&
ln
-sf
$(DYLIB_MINOR_NAME)
$(DYLIBNAME)
cd
$(INSTALL_LIBRARY_PATH)
&&
ln
-sf
$(DYLIB_MAJOR_NAME)
$(DYLIBNAME)
$(INSTALL)
$(STLIBNAME)
$(INSTALL_LIBRARY_PATH)
$(INSTALL)
$(STLIBNAME)
$(INSTALL_LIBRARY_PATH)
mkdir
-p
$(INSTALL_PKGCONF_PATH)
mkdir
-p
$(INSTALL_PKGCONF_PATH)
$(INSTALL)
$(PKGCONFNAME)
$(INSTALL_PKGCONF_PATH)
$(INSTALL)
$(PKGCONFNAME)
$(INSTALL_PKGCONF_PATH)
...
...
hiredis.h
View file @
9644a96a
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
#define HIREDIS_MAJOR 0
#define HIREDIS_MAJOR 0
#define HIREDIS_MINOR 13
#define HIREDIS_MINOR 13
#define HIREDIS_PATCH 1
#define HIREDIS_PATCH 1
#define HIREDIS_SONAME 0.13
/* Connection type can be blocking or non-blocking and is set in the
/* Connection type can be blocking or non-blocking and is set in the
* least significant bit of the flags field in redisContext. */
* least significant bit of the flags field in redisContext. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment