makefile: Clean up compiler flags
diff --git a/test/Makefile.am b/test/Makefile.am
index 7534c42..e899539 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,30 +1,28 @@
@VALGRIND_CHECK_RULES@
@CODE_COVERAGE_RULES@
-AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
- $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(SYSTEMD_CFLAGS) \
- $(CODE_COVERAGE_CPPFLAGS)
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-test_ldadd = $(top_builddir)/src/libsdeventplus.la $(SYSTEMD_LIBS) \
- $(CODE_COVERAGE_LIBS)
-gtest_ldadd = $(test_ldadd) $(GTEST_LIBS) $(GMOCK_LIBS) -lgmock_main
+gtest_cppflags = $(AM_CPPFLAGS) $(GTEST_CFLAGS) $(GMOCK_CFLAGS)
+gtest_ldadd = $(SDEVENTPLUS_LIBS) $(GTEST_LIBS) $(GMOCK_LIBS) -lgmock_main
check_PROGRAMS =
TESTS = $(check_PROGRAMS)
check_PROGRAMS += event
event_SOURCES = event.cpp
+event_CPPFLAGS = $(gtest_cppflags)
event_LDADD = $(gtest_ldadd)
check_PROGRAMS += exception
exception_SOURCES = exception.cpp
+exception_CPPFLAGS = $(gtest_cppflags)
exception_LDADD = $(gtest_ldadd)
check_PROGRAMS += sdref
sdref_SOURCES = sdref.cpp
+sdref_CPPFLAGS = $(gtest_cppflags)
sdref_LDADD = $(gtest_ldadd)
check_PROGRAMS += source
source_SOURCES = source.cpp
+source_CPPFLAGS = $(gtest_cppflags)
source_LDADD = $(gtest_ldadd)