aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yang Gao <yangg@google.com>2015-01-23 16:09:48 -0800
committerGravatar Yang Gao <yangg@google.com>2015-01-23 16:22:15 -0800
commited3ed701ce6ffb8aae181c7f362dcce6a89c00bd (patch)
treed1aa4fc59f73752a9b01317a3712b68f8644c9c7
parent1de8ddb224b4fe1c856722ec6d18c9076b802736 (diff)
run generate_projects.sh since I changed build.json
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1d1aff2a6a..dff032fa65 100644
--- a/Makefile
+++ b/Makefile
@@ -2133,9 +2133,9 @@ objs/$(CONFIG)/src/cpp/util/time.o:
LIBGRPC++_TEST_UTIL_SRC = \
+ gens/test/cpp/util/messages.pb.cc \
gens/test/cpp/util/echo.pb.cc \
gens/test/cpp/util/echo_duplicate.pb.cc \
- gens/test/cpp/util/messages.pb.cc \
test/cpp/end2end/async_test_server.cc \
test/cpp/util/create_test_channel.cc \
@@ -2152,9 +2152,9 @@ libs/$(CONFIG)/libgrpc++_test_util.a: openssl_dep_error
else
ifneq ($(OPENSSL_DEP),)
+test/cpp/util/messages.proto: $(OPENSSL_DEP)
test/cpp/util/echo.proto: $(OPENSSL_DEP)
test/cpp/util/echo_duplicate.proto: $(OPENSSL_DEP)
-test/cpp/util/messages.proto: $(OPENSSL_DEP)
test/cpp/end2end/async_test_server.cc: $(OPENSSL_DEP)
test/cpp/util/create_test_channel.cc: $(OPENSSL_DEP)
endif
@@ -2183,8 +2183,8 @@ endif
-objs/$(CONFIG)/test/cpp/end2end/async_test_server.o: gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc gens/test/cpp/util/messages.pb.cc
-objs/$(CONFIG)/test/cpp/util/create_test_channel.o: gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc gens/test/cpp/util/messages.pb.cc
+objs/$(CONFIG)/test/cpp/end2end/async_test_server.o: gens/test/cpp/util/messages.pb.cc gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc
+objs/$(CONFIG)/test/cpp/util/create_test_channel.o: gens/test/cpp/util/messages.pb.cc gens/test/cpp/util/echo.pb.cc gens/test/cpp/util/echo_duplicate.pb.cc
LIBTIPS_CLIENT_LIB_SRC = \