Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
bba83513
Commit
bba83513
authored
Oct 10, 2017
by
gejun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove *.pb.h and *.pb.cc at cleaning
parent
4d2509f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
Makefile
Makefile
+5
-3
Makefile
test/Makefile
+8
-10
No files found.
Makefile
View file @
bba83513
...
@@ -7,8 +7,8 @@ include config.mk
...
@@ -7,8 +7,8 @@ include config.mk
# 3. Removed -Werror: Not block compilation for non-vital warnings, especially when the
# 3. Removed -Werror: Not block compilation for non-vital warnings, especially when the
# code is tested on newer systems. If the code is used in production, add -Werror back
# code is tested on newer systems. If the code is used in production, add -Werror back
CPPFLAGS
+=
-DBTHREAD_USE_FAST_PTHREAD_MUTEX
-D__const__
=
-D_GNU_SOURCE
-DUSE_SYMBOLIZE
-DNO_TCMALLOC
-D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS
-DBRPC_REVISION
=
\"
$(
shell
git rev-parse
--short
HEAD
)
\"
CPPFLAGS
+=
-DBTHREAD_USE_FAST_PTHREAD_MUTEX
-D__const__
=
-D_GNU_SOURCE
-DUSE_SYMBOLIZE
-DNO_TCMALLOC
-D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS
-DBRPC_REVISION
=
\"
$(
shell
git rev-parse
--short
HEAD
)
\"
CXXFLAGS
+
=
$(CPPFLAGS)
-O2
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-invalid-offsetof
-Wno-unused-parameter
-fno-omit-frame-pointer
-std
=
c++0x
CXXFLAGS
=
$(CPPFLAGS)
-O2
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-invalid-offsetof
-Wno-unused-parameter
-fno-omit-frame-pointer
-std
=
c++0x
CFLAGS
+
=
$(CPPFLAGS)
-O2
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-unused-parameter
-fno-omit-frame-pointer
CFLAGS
=
$(CPPFLAGS)
-O2
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-unused-parameter
-fno-omit-frame-pointer
DEBUG_CXXFLAGS
=
$
(
filter-out
-DNDEBUG
,
$(CXXFLAGS)
)
-DUNIT_TEST
-DBVAR_NOT_LINK_DEFAULT_VARIABLES
DEBUG_CXXFLAGS
=
$
(
filter-out
-DNDEBUG
,
$(CXXFLAGS)
)
-DUNIT_TEST
-DBVAR_NOT_LINK_DEFAULT_VARIABLES
DEBUG_CFLAGS
=
$
(
filter-out
-DNDEBUG
,
$(CFLAGS)
)
-DUNIT_TEST
DEBUG_CFLAGS
=
$
(
filter-out
-DNDEBUG
,
$(CFLAGS)
)
-DUNIT_TEST
HDRPATHS
=
-I
./src
$
(
addprefix
-I
,
$(HDRS)
)
HDRPATHS
=
-I
./src
$
(
addprefix
-I
,
$(HDRS)
)
...
@@ -174,6 +174,8 @@ OBJS=$(BUTIL_OBJS) $(BVAR_OBJS) $(BTHREAD_OBJS) $(JSON2PB_OBJS) $(MCPACK2PB_OBJS
...
@@ -174,6 +174,8 @@ OBJS=$(BUTIL_OBJS) $(BVAR_OBJS) $(BTHREAD_OBJS) $(JSON2PB_OBJS) $(MCPACK2PB_OBJS
BVAR_DEBUG_OBJS
=
$
(
BUTIL_OBJS:.o
=
.dbg.o
)
$
(
BVAR_OBJS:.o
=
.dbg.o
)
BVAR_DEBUG_OBJS
=
$
(
BUTIL_OBJS:.o
=
.dbg.o
)
$
(
BVAR_OBJS:.o
=
.dbg.o
)
DEBUG_OBJS
=
$
(
OBJS:.o
=
.dbg.o
)
DEBUG_OBJS
=
$
(
OBJS:.o
=
.dbg.o
)
PROTOS
=
$(BRPC_PROTOS)
src/idl_options.proto
.PHONY
:
all
.PHONY
:
all
all
:
protoc-gen-mcpack libbrpc.a libbrpc.so output/include output/lib output/bin
all
:
protoc-gen-mcpack libbrpc.a libbrpc.so output/include output/lib output/bin
...
@@ -183,7 +185,7 @@ debug: libbrpc.dbg.a libbvar.dbg.a
...
@@ -183,7 +185,7 @@ debug: libbrpc.dbg.a libbvar.dbg.a
.PHONY
:
clean
.PHONY
:
clean
clean
:
clean_debug
clean
:
clean_debug
@
echo
"Cleaning"
@
echo
"Cleaning"
@
rm
-rf
src/mcpack2pb/generator.o protoc-gen-mcpack libbrpc.a libbrpc.so
$(OBJS)
output/include output/lib output/bin
@
rm
-rf
src/mcpack2pb/generator.o protoc-gen-mcpack libbrpc.a libbrpc.so
$(OBJS)
output/include output/lib output/bin
$
(
PROTOS:.proto
=
.pb.h
)
$
(
PROTOS:.proto
=
.pb.cc
)
.PHONY
:
clean_debug
.PHONY
:
clean_debug
clean_debug
:
clean_debug
:
...
...
test/Makefile
View file @
bba83513
NEED_GPERFTOOLS
=
1
NEED_GPERFTOOLS
=
1
NEED_GTEST
=
1
NEED_GTEST
=
1
include
../config.mk
include
../config.mk
CPPFLAGS
+=
-DBTHREAD_USE_FAST_PTHREAD_MUTEX
-D__const__
=
-D_GNU_SOURCE
-DUSE_SYMBOLIZE
-DNO_TCMALLOC
-D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS
CPPFLAGS
+=
-DBTHREAD_USE_FAST_PTHREAD_MUTEX
-D__const__
=
-D_GNU_SOURCE
-DUSE_SYMBOLIZE
-DNO_TCMALLOC
-D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS
-DUNIT_TEST
-Dprivate
=
public
-Dprotected
=
public
-DBVAR_NOT_LINK_DEFAULT_VARIABLES
--include
sstream_workaround.h
CPPFLAGS
+=
-DUNIT_TEST
-Dprivate
=
public
-Dprotected
=
public
-DBVAR_NOT_LINK_DEFAULT_VARIABLES
--include
sstream_workaround.h
CXXFLAGS
=
$(CPPFLAGS)
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-invalid-offsetof
-Wno-unused-parameter
-fno-omit-frame-pointer
-std
=
c++0x
CXXFLAGS
+=
$(CPPFLAGS)
-pipe
-Wall
-W
-fPIC
-fstrict-aliasing
-Wno-invalid-offsetof
-Wno-unused-parameter
-fno-omit-frame-pointer
-std
=
c++0x
#required by butil/crc32.cc to boost performance for 10x
#required by butil/crc32.cc to boost performance for 10x
ifeq
($(shell
test
$(GCC_VERSION)
-ge
40400;
echo
$$?),0)
ifeq
($(shell
test
$(GCC_VERSION)
-ge
40400;
echo
$$?),0)
...
@@ -128,7 +127,7 @@ TEST_BRPC_SOURCES = $(wildcard brpc_*unittest.cpp)
...
@@ -128,7 +127,7 @@ TEST_BRPC_SOURCES = $(wildcard brpc_*unittest.cpp)
TEST_BRPC_OBJS
=
$
(
addsuffix .o,
$
(
basename
$(TEST_BRPC_SOURCES)
))
TEST_BRPC_OBJS
=
$
(
addsuffix .o,
$
(
basename
$(TEST_BRPC_SOURCES)
))
TEST_PROTO_SOURCES
=
$
(
wildcard
*
.proto
)
TEST_PROTO_SOURCES
=
$
(
wildcard
*
.proto
)
TEST_PROTO_OBJS
=
$
(
TEST_PROTO_SOURCES:.proto
=
.pb.o
)
TEST_PROTO_OBJS
=
$
(
TEST_PROTO_SOURCES:.proto
=
.pb.o
)
TEST_BINS
=
test_butil test_bvar
$
(
TEST_BTHREAD_SOURCES:.cpp
=)
$
(
TEST_BRPC_SOURCES:.cpp
=)
TEST_BINS
=
test_butil test_bvar
$
(
TEST_BTHREAD_SOURCES:.cpp
=)
$
(
TEST_BRPC_SOURCES:.cpp
=)
...
@@ -138,8 +137,7 @@ all: $(TEST_BINS)
...
@@ -138,8 +137,7 @@ all: $(TEST_BINS)
.PHONY
:
clean
.PHONY
:
clean
clean
:
clean_bins clean_debug
clean
:
clean_bins clean_debug
@
echo
"Cleaning"
@
echo
"Cleaning"
@
rm
-rf
$(TEST_BUTIL_OBJS)
$(TEST_BVAR_OBJS)
$(TEST_BTHREAD_OBJS)
\
@
rm
-rf
$(TEST_BUTIL_OBJS)
$(TEST_BVAR_OBJS)
$(TEST_BTHREAD_OBJS)
$(TEST_BRPC_OBJS)
$(TEST_PROTO_OBJS)
$(TEST_BRPC_OBJS)
$(TEST_PROTO_OBJS)
.PHONY
:
clean_bins
.PHONY
:
clean_bins
clean_bins
:
clean_bins
:
...
@@ -156,19 +154,19 @@ FORCE:
...
@@ -156,19 +154,19 @@ FORCE:
.PRECIOUS
:
%.o
.PRECIOUS
:
%.o
test_butil
:
$(TEST_BUTIL_OBJS) ../libbrpc.dbg.a
test_butil
:
../libbrpc.dbg.a $(TEST_BUTIL_OBJS)
@
echo
"Linking
$@
"
@
echo
"Linking
$@
"
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
test_bvar
:
$(TEST_BVAR_OBJS) ../libbrpc.dbg.a
test_bvar
:
../libbrpc.dbg.a $(TEST_BVAR_OBJS)
@
echo
"Linking
$@
"
@
echo
"Linking
$@
"
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$(TEST_BVAR_OBJS)
../libbvar.dbg.a
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$(TEST_BVAR_OBJS)
../libbvar.dbg.a
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
bthread%unittest
:
bthread%unittest.o ../libbrpc.dbg.a
bthread%unittest
:
../libbrpc.dbg.a bthread%unittest.o
@
echo
"Linking
$@
"
@
echo
"Linking
$@
"
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
brpc_%_unittest
:
$(TEST_PROTO_OBJS) brpc_%_unittest.o ../libbrpc.dbg.a
brpc_%_unittest
:
../libbrpc.dbg.a $(TEST_PROTO_OBJS) brpc_%_unittest.o
@
echo
"Linking
$@
"
@
echo
"Linking
$@
"
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
@
$(CXX)
-o
$@
$(LIBPATHS)
-Xlinker
"-("
$^
-Wl
,-Bstatic
$(STATIC_LINKINGS)
-Wl
,-Bdynamic
-Xlinker
"-)"
$(DYNAMIC_LINKINGS)
...
...
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