aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/environments/paludis/Makefile.am')
-rw-r--r--paludis/environments/paludis/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 8a82fbfa2..400a1f3cc 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -68,23 +68,27 @@ check_SCRIPTS = \
paludis_environment_TEST_SOURCES = paludis_environment_TEST.cc
paludis_environment_TEST_LDADD = \
- $(top_builddir)/test/libtest.a \
+ $(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
paludis_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+paludis_environment_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+
world_TEST_SOURCES = world_TEST.cc
world_TEST_LDADD = \
- $(top_builddir)/test/libtest.a \
+ $(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
world_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+world_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+
logdir = @HACKED_LOG_DIR@
log_DATA = .keep