aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/Makefile.am
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-05-06 22:10:56 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-05-12 11:33:35 +0100
commita7865e3c6ae5e21e474a47ffa87be6e7ef3e7667 (patch)
tree6eed5a2554863ca688949982cf08f378675529c0 /paludis/repositories/e/Makefile.am
parent57208caa313878d8128d4c723a675d2c7553757f (diff)
downloadpaludis-a7865e3c6ae5e21e474a47ffa87be6e7ef3e7667.tar.gz
paludis-a7865e3c6ae5e21e474a47ffa87be6e7ef3e7667.tar.xz
EAPI 5 has ?? ( ) in REQUIRED_USE
Diffstat (limited to 'paludis/repositories/e/Makefile.am')
-rw-r--r--paludis/repositories/e/Makefile.am49
1 files changed, 33 insertions, 16 deletions
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index c3ecc8599..9ffaa8760 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -235,29 +235,29 @@ e_repository_TEST_exheres_0_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_C
e_repository_TEST_exheres_0_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-e_repository_TEST_3_SOURCES = e_repository_TEST_3.cc
+e_repository_TEST_0_SOURCES = e_repository_TEST_0.cc
-e_repository_TEST_3_LDADD = \
+e_repository_TEST_0_LDADD = \
$(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-e_repository_TEST_3_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
+e_repository_TEST_0_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-e_repository_TEST_3_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+e_repository_TEST_0_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-e_repository_TEST_4_SOURCES = e_repository_TEST_4.cc
+e_repository_TEST_1_SOURCES = e_repository_TEST_1.cc
-e_repository_TEST_4_LDADD = \
+e_repository_TEST_1_LDADD = \
$(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-e_repository_TEST_4_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
+e_repository_TEST_1_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-e_repository_TEST_4_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+e_repository_TEST_1_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
e_repository_TEST_2_SOURCES = e_repository_TEST_2.cc
@@ -271,29 +271,41 @@ e_repository_TEST_2_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_
e_repository_TEST_2_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-e_repository_TEST_1_SOURCES = e_repository_TEST_1.cc
+e_repository_TEST_3_SOURCES = e_repository_TEST_3.cc
-e_repository_TEST_1_LDADD = \
+e_repository_TEST_3_LDADD = \
$(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-e_repository_TEST_1_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
+e_repository_TEST_3_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-e_repository_TEST_1_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+e_repository_TEST_3_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-e_repository_TEST_0_SOURCES = e_repository_TEST_0.cc
+e_repository_TEST_4_SOURCES = e_repository_TEST_4.cc
-e_repository_TEST_0_LDADD = \
+e_repository_TEST_4_LDADD = \
$(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-e_repository_TEST_0_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
+e_repository_TEST_4_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-e_repository_TEST_0_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+e_repository_TEST_4_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+
+e_repository_TEST_5_SOURCES = e_repository_TEST_5.cc
+
+e_repository_TEST_5_LDADD = \
+ $(top_builddir)/paludis/util/gtest_runner.o \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(DYNAMIC_LD_LIBS)
+
+e_repository_TEST_5_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
+
+e_repository_TEST_5_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
e_repository_TEST_phases_SOURCES = e_repository_TEST_phases.cc
@@ -532,6 +544,9 @@ EXTRA_DIST = \
e_repository_TEST_4.cc \
e_repository_TEST_4_setup.sh \
e_repository_TEST_4_cleanup.sh \
+ e_repository_TEST_5.cc \
+ e_repository_TEST_5_setup.sh \
+ e_repository_TEST_5_cleanup.sh \
e_repository_TEST_pbin.cc \
e_repository_TEST_pbin_setup.sh \
e_repository_TEST_pbin_cleanup.sh \
@@ -604,6 +619,7 @@ check_SCRIPTS = \
e_repository_TEST_2_setup.sh e_repository_TEST_2_cleanup.sh \
e_repository_TEST_3_setup.sh e_repository_TEST_3_cleanup.sh \
e_repository_TEST_4_setup.sh e_repository_TEST_4_cleanup.sh \
+ e_repository_TEST_5_setup.sh e_repository_TEST_5_cleanup.sh \
e_repository_TEST_pbin_setup.sh e_repository_TEST_pbin_cleanup.sh \
e_repository_TEST_phases_setup.sh e_repository_TEST_phases_cleanup.sh \
e_repository_TEST_exlibs_setup.sh e_repository_TEST_exlibs_cleanup.sh \
@@ -692,6 +708,7 @@ TESTS = \
e_repository_TEST_2 \
e_repository_TEST_3 \
e_repository_TEST_4 \
+ e_repository_TEST_5 \
e_repository_TEST_ever \
e_repository_TEST_exheres_0 \
e_repository_TEST_exlibs \