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
redis
Commits
63457d1a
Commit
63457d1a
authored
Apr 02, 2013
by
Salvatore Sanfilippo
Browse files
Merge pull request #1017 from jbergstroem/build-improvements
Build improvements
parents
86d87e35
8080e1cf
Changes
3
Show whitespace changes
Inline
Side-by-side
deps/Makefile
View file @
63457d1a
deps/lua/src/Makefile
View file @
63457d1a
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
# Your platform. See PLATS for possible values.
# Your platform. See PLATS for possible values.
PLAT
=
none
PLAT
=
none
CC
=
gcc
CC
?
=
gcc
CFLAGS
=
-O2
-Wall
$(MYCFLAGS)
CFLAGS
=
-O2
-Wall
$(MYCFLAGS)
AR
=
ar rcu
AR
=
ar rcu
RANLIB
=
ranlib
RANLIB
=
ranlib
...
...
src/Makefile
View file @
63457d1a
...
@@ -18,9 +18,13 @@ OPTIMIZATION?=-O2
...
@@ -18,9 +18,13 @@ OPTIMIZATION?=-O2
DEPENDENCY_TARGETS
=
hiredis linenoise lua
DEPENDENCY_TARGETS
=
hiredis linenoise lua
# Default settings
# Default settings
STD
=
-std
=
c99
-pedantic
STD
=
-std
=
c99
-pedantic
WARN
=
-Wall
WARN
=
-Wall
OPT
=
$(OPTIMIZATION)
OPT
=
$(OPTIMIZATION)
PREFIX
?=
/usr/local
INSTALL_BIN
=
$(PREFIX)
/bin
INSTALL
=
install
# Default allocator
# Default allocator
ifeq
($(uname_S),Linux)
ifeq
($(uname_S),Linux)
...
@@ -45,16 +49,20 @@ endif
...
@@ -45,16 +49,20 @@ endif
# Override default settings if possible
# Override default settings if possible
-include
.make-settings
-include
.make-settings
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
$(DEBUG)
FINAL_LIBS
=
-lm
DEBUG
=
-g
-ggdb
ifeq
($(uname_S),SunOS)
ifeq
($(uname_S),SunOS)
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
-D__EXTENSIONS__
-D_XPG6
INSTALL
=
cp
-pf
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
-g
-ggdb
FINAL_CFLAGS
+=
-D__EXTENSIONS__
-D_XPG6
FINAL_LIBS
=
-ldl
-lnsl
-lsocket
-lm
-lpthread
FINAL_LIBS
+=
-ldl
-lnsl
-lsocket
-lpthread
DEBUG
=
-g
-ggdb
else
ifeq
($(uname_S),Darwin)
else
else
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
FINAL_LDFLAGS
+=
-rdynamic
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
-g
-rdynamic
-ggdb
FINAL_LIBS
+=
-pthread
FINAL_LIBS
=
-lm
-pthread
DEBUG
=
-g
-rdynamic
-ggdb
endif
endif
# Include paths to dependencies
# Include paths to dependencies
...
@@ -80,10 +88,6 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
...
@@ -80,10 +88,6 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD
=
$(QUIET_LINK)$(CC)
$(FINAL_LDFLAGS)
REDIS_LD
=
$(QUIET_LINK)$(CC)
$(FINAL_LDFLAGS)
REDIS_INSTALL
=
$(QUIET_INSTALL)$(INSTALL)
REDIS_INSTALL
=
$(QUIET_INSTALL)$(INSTALL)
PREFIX
?=
/usr/local
INSTALL_BIN
=
$(PREFIX)
/bin
INSTALL
=
cp
-pf
CCCOLOR
=
"
\0
33[34m"
CCCOLOR
=
"
\0
33[34m"
LINKCOLOR
=
"
\0
33[34;1m"
LINKCOLOR
=
"
\0
33[34;1m"
SRCCOLOR
=
"
\0
33[33m"
SRCCOLOR
=
"
\0
33[33m"
...
@@ -97,17 +101,17 @@ QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(EN
...
@@ -97,17 +101,17 @@ QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(EN
QUIET_INSTALL
=
@printf
' %b %b\n'
$(LINKCOLOR)
INSTALL
$(ENDCOLOR)
$(BINCOLOR)$@$(ENDCOLOR)
1>&2
;
QUIET_INSTALL
=
@printf
' %b %b\n'
$(LINKCOLOR)
INSTALL
$(ENDCOLOR)
$(BINCOLOR)$@$(ENDCOLOR)
1>&2
;
endif
endif
REDIS_SERVER_NAME
=
redis-server
REDIS_SERVER_NAME
=
redis-server
REDIS_SENTINEL_NAME
=
redis-sentinel
REDIS_SENTINEL_NAME
=
redis-sentinel
REDIS_SERVER_OBJ
=
adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o
REDIS_SERVER_OBJ
=
adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o
REDIS_CLI_NAME
=
redis-cli
REDIS_CLI_NAME
=
redis-cli
REDIS_CLI_OBJ
=
anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
REDIS_CLI_OBJ
=
anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
REDIS_BENCHMARK_NAME
=
redis-benchmark
REDIS_BENCHMARK_NAME
=
redis-benchmark
REDIS_BENCHMARK_OBJ
=
ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o redis-benchmark.o
REDIS_BENCHMARK_OBJ
=
ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o redis-benchmark.o
REDIS_CHECK_DUMP_NAME
=
redis-check-dump
REDIS_CHECK_DUMP_NAME
=
redis-check-dump
REDIS_CHECK_DUMP_OBJ
=
redis-check-dump.o lzf_c.o lzf_d.o crc64.o
REDIS_CHECK_DUMP_OBJ
=
redis-check-dump.o lzf_c.o lzf_d.o crc64.o
REDIS_CHECK_AOF_NAME
=
redis-check-aof
REDIS_CHECK_AOF_NAME
=
redis-check-aof
REDIS_CHECK_AOF_OBJ
=
redis-check-aof.o
REDIS_CHECK_AOF_OBJ
=
redis-check-aof.o
all
:
$(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_DUMP_NAME) $(REDIS_CHECK_AOF_NAME)
all
:
$(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_DUMP_NAME) $(REDIS_CHECK_AOF_NAME)
@
echo
""
@
echo
""
...
@@ -196,6 +200,8 @@ distclean: clean
...
@@ -196,6 +200,8 @@ distclean: clean
test
:
$(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
test
:
$(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
@
(
cd
..
;
./runtest
)
@
(
cd
..
;
./runtest
)
check
:
test
lcov
:
lcov
:
$(MAKE)
gcov
$(MAKE)
gcov
@
(
set
-e
;
cd
..
;
./runtest
--clients
1
)
@
(
set
-e
;
cd
..
;
./runtest
--clients
1
)
...
@@ -226,7 +232,7 @@ src/help.h:
...
@@ -226,7 +232,7 @@ src/help.h:
@
../utils/generate-command-help.rb
>
help.h
@
../utils/generate-command-help.rb
>
help.h
install
:
all
install
:
all
mkdir
-p
$(INSTALL_BIN)
@
mkdir
-p
$(INSTALL_BIN)
$(REDIS_INSTALL)
$(REDIS_SERVER_NAME)
$(INSTALL_BIN)
$(REDIS_INSTALL)
$(REDIS_SERVER_NAME)
$(INSTALL_BIN)
$(REDIS_INSTALL)
$(REDIS_BENCHMARK_NAME)
$(INSTALL_BIN)
$(REDIS_INSTALL)
$(REDIS_BENCHMARK_NAME)
$(INSTALL_BIN)
$(REDIS_INSTALL)
$(REDIS_CLI_NAME)
$(INSTALL_BIN)
$(REDIS_INSTALL)
$(REDIS_CLI_NAME)
$(INSTALL_BIN)
...
...
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