From 1d82fd89413bc40ef30231c36e901a1beb8a59e8 Mon Sep 17 00:00:00 2001 From: Tom Hromatka Date: Fri, 10 Jan 2020 22:46:26 +0000 Subject: [PATCH] gtest: Cleanup gtest make targets Prior to this commit the unit test map file was being included in the source directory. It has now been moved to the tests/gunit directory. This commit also properly connects the tests/gunit Makefile to the googletest *.la so that a recompile of googletest is not required. Signed-off-by: Tom Hromatka Reviewed-by: Dhaval Giani --- tests/gunit/Makefile.am | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/gunit/Makefile.am b/tests/gunit/Makefile.am index 43526f07..e108d322 100644 --- a/tests/gunit/Makefile.am +++ b/tests/gunit/Makefile.am @@ -27,9 +27,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ -DSTATIC= \ -DUNIT_TEST LDADD = ../../src/.libs/libcgroupfortesting.la \ - libgtest.la + $(top_srcdir)/googletest/googletest/lib/libgtest.la \ + $(top_srcdir)/googletest/googletest/lib/libgtest_main.la -libgtest_la_SOURCES = ../../googletest/googletest/src/gtest-all.cc +EXTRA_DIST = $(top_srcdir)/googletest/googletest/lib/libgtest.la \ + $(top_srcdir)/googletest/googletest/lib/libgtest_main.la \ + $(top_srcdir)/googletest/googletest/lib/.libs \ + $(top_srcdir)/googletest/googletest/include + +libgtest_la_SOURCES = libcgroup_unittest.map libgtest_la_CPPFLAGS = -I$(top_builddir)/googletest/googletest/include \ -I$(top_builddir)/googletest/googletest libgtest_la_LDFLAGS = -lpthread -- 2.47.2