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
461110e8
Commit
461110e8
authored
Jun 18, 2011
by
Pieter Noordhuis
Browse files
Move path variables closer to install target
parent
b2bf7ba8
Changes
1
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
461110e8
...
@@ -25,7 +25,6 @@ DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
...
@@ -25,7 +25,6 @@ DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
DYLIB_MAKE_CMD
=
$(CC)
-shared
-Wl
,-soname,
$(DYLIB_MINOR_NAME)
-o
$(DYLIBNAME)
DYLIB_MAKE_CMD
=
$(CC)
-shared
-Wl
,-soname,
$(DYLIB_MINOR_NAME)
-o
$(DYLIBNAME)
STLIBNAME
=
$(LIBNAME)
.
$(STLIBSUFFIX)
STLIBNAME
=
$(LIBNAME)
.
$(STLIBSUFFIX)
STLIB_MAKE_CMD
=
ar rcs
$(STLIBNAME)
STLIB_MAKE_CMD
=
ar rcs
$(STLIBNAME)
INSTALL
=
cp
-a
uname_S
:=
$(
shell
sh
-c
'uname -s 2>/dev/null || echo not'
)
uname_S
:=
$(
shell
sh
-c
'uname -s 2>/dev/null || echo not'
)
ifeq
($(uname_S),SunOS)
ifeq
($(uname_S),SunOS)
...
@@ -46,12 +45,6 @@ ifeq ($(uname_S),Darwin)
...
@@ -46,12 +45,6 @@ ifeq ($(uname_S),Darwin)
STLIB_MAKE_CMD
=
libtool
-static
-o
$(STLIBNAME)
-
STLIB_MAKE_CMD
=
libtool
-static
-o
$(STLIBNAME)
-
endif
endif
PREFIX
?=
/usr/local
INCLUDE_PATH
?=
include/hiredis
LIBRARY_PATH
?=
lib
INSTALL_INCLUDE_PATH
=
$(PREFIX)
/
$(INCLUDE_PATH)
INSTALL_LIBRARY_PATH
=
$(PREFIX)
/
$(LIBRARY_PATH)
all
:
$(DYLIBNAME) $(BINS)
all
:
$(DYLIBNAME) $(BINS)
# Deps (use make dep to generate this)
# Deps (use make dep to generate this)
...
@@ -114,6 +107,19 @@ clean:
...
@@ -114,6 +107,19 @@ clean:
dep
:
dep
:
$(CC)
-MM
*
.c
$(CC)
-MM
*
.c
# Installation related variables and target
PREFIX
?=
/usr/local
INCLUDE_PATH
?=
include/hiredis
LIBRARY_PATH
?=
lib
INSTALL_INCLUDE_PATH
=
$(PREFIX)
/
$(INCLUDE_PATH)
INSTALL_LIBRARY_PATH
=
$(PREFIX)
/
$(LIBRARY_PATH)
ifeq
($(uname_S),SunOS)
INSTALL
?=
cp
-r
endif
INSTALL
?=
cp
-a
install
:
$(DYLIBNAME) $(STLIBNAME)
install
:
$(DYLIBNAME) $(STLIBNAME)
mkdir
-p
$(INSTALL_INCLUDE_PATH)
$(INSTALL_LIBRARY_PATH)
mkdir
-p
$(INSTALL_INCLUDE_PATH)
$(INSTALL_LIBRARY_PATH)
$(INSTALL)
hiredis.h async.h adapters
$(INSTALL_INCLUDE_PATH)
$(INSTALL)
hiredis.h async.h adapters
$(INSTALL_INCLUDE_PATH)
...
@@ -122,7 +128,6 @@ install: $(DYLIBNAME) $(STLIBNAME)
...
@@ -122,7 +128,6 @@ install: $(DYLIBNAME) $(STLIBNAME)
cd
$(INSTALL_LIBRARY_PATH)
&&
ln
-sf
$(DYLIB_MAJOR_NAME)
$(DYLIBNAME)
cd
$(INSTALL_LIBRARY_PATH)
&&
ln
-sf
$(DYLIB_MAJOR_NAME)
$(DYLIBNAME)
$(INSTALL)
$(STLIBNAME)
$(INSTALL_LIBRARY_PATH)
$(INSTALL)
$(STLIBNAME)
$(INSTALL_LIBRARY_PATH)
32bit
:
32bit
:
@
echo
""
@
echo
""
@
echo
"WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
@
echo
"WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
...
...
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