diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-13 16:17:26 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-13 16:17:26 -0700 |
| commit | 0fe72429a03dd1ac6081ee8efe8fe7b85da7bef3 (patch) | |
| tree | e18efd405fce4cb017105fedf9e1cef5585824e0 /Makefile | |
| parent | 7b1bd2c2713c9d505094ab728a08d4c94f15c6fa (diff) | |
| parent | bee8f104c0827bc829402d79c8302835adfc37f9 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into microchannels
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -4088,6 +4088,8 @@ clean: LIBGPR_SRC = \ + src/core/profiling/basic_timers.c \ + src/core/profiling/stap_timers.c \ src/core/support/alloc.c \ src/core/support/cmdline.c \ src/core/support/cpu_iphone.c \ @@ -4123,6 +4125,7 @@ LIBGPR_SRC = \ src/core/support/thd_win32.c \ src/core/support/time.c \ src/core/support/time_posix.c \ + src/core/support/time_precise.c \ src/core/support/time_win32.c \ src/core/support/tls_pthread.c \ @@ -4313,8 +4316,6 @@ LIBGRPC_SRC = \ src/core/json/json_reader.c \ src/core/json/json_string.c \ src/core/json/json_writer.c \ - src/core/profiling/basic_timers.c \ - src/core/profiling/stap_timers.c \ src/core/surface/api_trace.c \ src/core/surface/byte_buffer.c \ src/core/surface/byte_buffer_queue.c \ @@ -4596,8 +4597,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/json/json_reader.c \ src/core/json/json_string.c \ src/core/json/json_writer.c \ - src/core/profiling/basic_timers.c \ - src/core/profiling/stap_timers.c \ src/core/surface/api_trace.c \ src/core/surface/byte_buffer.c \ src/core/surface/byte_buffer_queue.c \ |