... will look into some unit and integration testing for all metrics code next in a separate CL.
Review URL: http://codereview.chromium.org/1863002
diff --git a/metrics/Makefile b/metrics/Makefile
index 54b9f53..784ff91 100644
--- a/metrics/Makefile
+++ b/metrics/Makefile
@@ -8,8 +8,7 @@
CCONFIG = $(shell $(PKG_CONFIG) --cflags dbus-1 glib-2.0 dbus-glib-1)
LDCONFIG = $(shell $(PKG_CONFIG) --libs dbus-1 glib-2.0 gthread-2.0 dbus-glib-1)
-CFLAGS = -Wall -Werror -I/usr/include -fPIC -O2 $(CCONFIG)
-CXXFLAGS = $(CFLAGS) -fno-exceptions
+CXXFLAGS += -Wall -Werror -fPIC -fno-exceptions $(CCONFIG)
CLIENT = metrics_client
DAEMON = metrics_daemon
@@ -51,9 +50,6 @@
%.o: %.cc
$(CXX) $(CXXFLAGS) -c $< -o $@
-%.o: %.c
- $(CC) $(CFLAGS) -c $< -o $@
-
# dependencies in addition to those defined by the rules
metrics_daemon.o: \