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 <tom.hromatka@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/tests/gunit/Makefile.am b/tests/gunit/Makefile.am
index 43526f078f9c9bedaba5d8d9b6adf6a189fcac33..e108d322863b0f87d76b4cd905dd5d73686be389 100644 (file)
--- 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