Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: Makefile

Issue 2731008: Implement a persistent storage aggregation counter class. (Closed) Base URL: ssh://git@chromiumos-git/metrics.git
Patch Set: Address kmixter's comments. Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | counter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile
diff --git a/Makefile b/Makefile
index e0c37414a050a6378cf05e7877e33305b1defbc1..c8ba54517986f3e3705799448739bea062ff90ea 100644
--- a/Makefile
+++ b/Makefile
@@ -16,32 +16,42 @@ DAEMON_TEST = metrics_daemon_test
LIB = libmetrics.a
SHAREDLIB = libmetrics.so
LIB_TEST = metrics_library_test
+COUNTER_TEST = counter_test
+TESTCOUNTER_OBJS = \
+ counter.o \
+ counter_test.o
CLIENT_OBJS = \
metrics_client.o
-LIB_OBJS = \
- metrics_library.o
-TESTLIB_OBJS = \
- metrics_library.o \
- metrics_library_test.o
DAEMON_OBJS = \
+ counter.o \
metrics_daemon.o \
metrics_daemon_main.o
TESTDAEMON_OBJS = \
+ counter.o \
metrics_daemon.o \
metrics_daemon_test.o
+LIB_OBJS = \
+ metrics_library.o
+TESTLIB_OBJS = \
+ metrics_library.o \
+ metrics_library_test.o
+TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread
DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags
TESTDAEMON_LIBS = -lgmock -lgtest
TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread
all: $(LIB) $(SHAREDLIB) $(CLIENT) $(DAEMON)
-tests: $(DAEMON_TEST) $(LIB_TEST)
+tests: $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST)
$(CLIENT): $(CLIENT_OBJS) $(SHAREDLIB)
$(CXX) $(LDFLAGS) $^ -o $@
+$(COUNTER_TEST): $(TESTCOUNTER_OBJS)
+ $(CXX) -o $@ $^ $(TESTCOUNTER_LIBS)
+
$(DAEMON): $(DAEMON_OBJS) $(SHAREDLIB)
$(CXX) -o $@ $^ $(DAEMON_LDFLAGS)
@@ -73,4 +83,4 @@ metrics_daemon_test.o: \
clean:
rm -f $(CLIENT) $(DAEMON) $(LIB) $(SHAREDLIB) *.o
- rm -f $(DAEMON_TEST) $(LIB_TEST)
+ rm -f $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST)
« no previous file with comments | « no previous file | counter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698