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
1381e22d
Commit
1381e22d
authored
Apr 22, 2011
by
Pieter Noordhuis
Browse files
Move OBJ argument
parent
595f2f88
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
1381e22d
...
...
@@ -15,9 +15,9 @@ ifeq ($(uname_S),SunOS)
DYLIBSUFFIX
=
so
STLIBSUFFIX
=
a
DYLIBNAME
?=
$(LIBNAME)
.
$(DYLIBSUFFIX)
DYLIB_MAKE_CMD
?=
$(CC)
-G
-o
$(DYLIBNAME)
$(OBJ)
DYLIB_MAKE_CMD
?=
$(CC)
-G
-o
$(DYLIBNAME)
STLIBNAME
?=
$(LIBNAME)
.
$(STLIBSUFFIX)
STLIB_MAKE_CMD
?=
ar rcs
$(STLIBNAME)
$(OBJ)
STLIB_MAKE_CMD
?=
ar rcs
$(STLIBNAME)
else
ifeq
($(uname_S),Darwin)
CFLAGS
?=
$(OPTIMIZATION)
-fPIC
-Wall
-W
-Wstrict-prototypes
-Wwrite-strings
$(ARCH)
$(PROF)
...
...
@@ -27,9 +27,9 @@ ifeq ($(uname_S),Darwin)
DYLIBSUFFIX
=
dylib
STLIBSUFFIX
=
a
DYLIBNAME
?=
$(LIBNAME)
.
$(DYLIBSUFFIX)
DYLIB_MAKE_CMD
?=
libtool
-dynamic
-o
$(DYLIBNAME)
-lm
$(DEBUG)
-
$(OBJ)
DYLIB_MAKE_CMD
?=
libtool
-dynamic
-o
$(DYLIBNAME)
-lm
$(DEBUG)
-
STLIBNAME
?=
$(LIBNAME)
.
$(STLIBSUFFIX)
STLIB_MAKE_CMD
?=
libtool
-static
-o
$(STLIBNAME)
-
$(OBJ)
STLIB_MAKE_CMD
?=
libtool
-static
-o
$(STLIBNAME)
-
else
CFLAGS
?=
$(OPTIMIZATION)
-fPIC
-Wall
-W
-Wstrict-prototypes
-Wwrite-strings
$(ARCH)
$(PROF)
CCLINK
?=
-lm
-pthread
...
...
@@ -37,9 +37,9 @@ else
DYLIBSUFFIX
=
so
STLIBSUFFIX
=
a
DYLIBNAME
?=
$(LIBNAME)
.
$(DYLIBSUFFIX)
DYLIB_MAKE_CMD
?=
gcc
-shared
-Wl
,-soname,
$(DYLIBNAME)
-o
$(DYLIBNAME)
$(OBJ)
DYLIB_MAKE_CMD
?=
gcc
-shared
-Wl
,-soname,
$(DYLIBNAME)
-o
$(DYLIBNAME)
STLIBNAME
?=
$(LIBNAME)
.
$(STLIBSUFFIX)
STLIB_MAKE_CMD
?=
ar rcs
$(STLIBNAME)
$(OBJ)
STLIB_MAKE_CMD
?=
ar rcs
$(STLIBNAME)
endif
endif
...
...
@@ -64,10 +64,10 @@ sds.o: sds.c sds.h
test.o
:
test.c hiredis.h
$(DYLIBNAME)
:
$(OBJ)
$(DYLIB_MAKE_CMD)
$(DYLIB_MAKE_CMD)
$(OBJ)
$(STLIBNAME)
:
$(OBJ)
$(STLIB_MAKE_CMD)
$(STLIB_MAKE_CMD)
$(OBJ)
dynamic
:
$(DYLIBNAME)
static
:
$(STLIBNAME)
...
...
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