aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-11 15:39:29 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-11 03:15:45 +0000
commit4a75fa6d9d5f987d600afab37395101c625dae93 (patch)
treeb2207b338f7fdd066c5bdcbd7f383aa9fe589d09
parentfd3ab99dfd48bc11c525d56ef9e81ba5a9e24d79 (diff)
downloadpaludis-4a75fa6d9d5f987d600afab37395101c625dae93.tar.gz
paludis-4a75fa6d9d5f987d600afab37395101c625dae93.tar.xz
Avoid -g for tests.
-rw-r--r--configure.ac19
-rw-r--r--paludis/Makefile.am.m44
-rw-r--r--paludis/args/Makefile.am1
-rw-r--r--paludis/environments/no_config/Makefile.am2
-rw-r--r--paludis/environments/paludis/Makefile.am14
-rw-r--r--paludis/environments/portage/Makefile.am2
-rw-r--r--paludis/repositories/cran/Makefile.am10
-rw-r--r--paludis/repositories/e/Makefile.am28
-rw-r--r--paludis/repositories/e/qa/Makefile.am22
-rw-r--r--paludis/repositories/fake/Makefile.am6
-rw-r--r--paludis/repositories/gems/Makefile.am10
-rw-r--r--paludis/repositories/unavailable/Makefile.am2
-rw-r--r--paludis/repositories/unpackaged/Makefile.am6
-rw-r--r--paludis/repositories/unwritten/Makefile.am2
-rw-r--r--paludis/repositories/virtuals/Makefile.am4
-rw-r--r--paludis/util/Makefile.am.m42
-rw-r--r--python/Makefile.am7
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/Makefile.am1
-rw-r--r--src/clients/reconcilio/util/Makefile.am4
-rw-r--r--test/Makefile.am2
20 files changed, 114 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac
index 5a8c8b4..1f94252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -791,6 +791,24 @@ PALUDIS_CXXFLAGS_NO_STRICT_ALIASING=$PALUDIS_CXXFLAGS
PALUDIS_CXXFLAGS=$old_PALUDIS_CXXFLAGS
AC_SUBST([PALUDIS_CXXFLAGS_NO_STRICT_ALIASING])
+AC_MSG_CHECKING([for debugging flags to move from CXXFLAGS to PALUDIS_CXXFLAGS])
+cxxflags_g=
+cxxflags_rest=
+for flag in $CXXFLAGS ; do
+ if echo $flag | grep '^-g' >/dev/null ; then
+ cxxflags_g="${cxxflags_g} ${flag}"
+ else
+ cxxflags_rest="${cxxflags_rest} ${flag}"
+ fi
+done
+AC_MSG_RESULT([$cxxflags_g])
+CXXFLAGS=$cxxflags_rest
+AC_MSG_CHECKING([for new CXXFLAGS])
+AC_MSG_RESULT([$CXXFLAGS])
+PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} ${cxxflags_g}"
+AC_MSG_CHECKING([for new PALUDIS_CXXFLAGS])
+AC_MSG_RESULT([$PALUDIS_CXXFLAGS])
+
AC_MSG_CHECKING([whether we can turn off debugging to avoid pythons eating all your rams])
old_PALUDIS_CXXFLAGS=$PALUDIS_CXXFLAGS
PALUDIS_CXXFLAGS=
@@ -799,6 +817,7 @@ AC_MSG_RESULT([$PALUDIS_CXXFLAGS])
PALUDIS_CXXFLAGS_NO_DEBUGGING=$PALUDIS_CXXFLAGS
PALUDIS_CXXFLAGS=$old_PALUDIS_CXXFLAGS
AC_SUBST([PALUDIS_CXXFLAGS_NO_DEBUGGING])
+
dnl }}}
dnl {{{ sandbox
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 539ee59..57ec966 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -25,7 +25,7 @@ $1_TEST_LDADD = \
libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS)
+$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
@@ -127,7 +127,7 @@ dep_list_TEST_blockers_LDADD = \
libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-dep_list_TEST_blockers_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS)
+dep_list_TEST_blockers_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
TESTS = testlist
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index ed1741d..460c849 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -69,6 +69,7 @@ test_ldadd = \
args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
+args_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index f1dae03..508d2c1 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -60,6 +60,8 @@ no_config_environment_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
+no_config_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
BUILT_SOURCES = \
no_config_environment-se.hh \
no_config_environment-se.cc
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 3963145..bbebe20 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -91,18 +91,6 @@ check_SCRIPTS = paludis_environment_TEST_setup.sh paludis_environment_TEST_clean
paludis_environment_TEST_SOURCES = paludis_environment_TEST.cc
-if MONOLITHIC
-
-paludis_environment_TEST_LDADD = \
- $(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/test/libtest.a \
- libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(DYNAMIC_LD_LIBS)
-
-else
-
paludis_environment_TEST_LDADD = \
libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -111,7 +99,7 @@ paludis_environment_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
-endif
+paludis_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index 1907007..ab83128 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -72,6 +72,8 @@ portage_environment_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
+portage_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
check_PROGRAMS = $(TESTS)
check_SCRIPTS = portage_environment_TEST_setup.sh portage_environment_TEST_cleanup.sh
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 696465e..e8168c2 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -63,11 +63,13 @@ TESTS = \
cran_dep_parser_TEST_SOURCES = cran_dep_parser_TEST.cc
-cran_dep_parser_TEST_LDADD= \
+cran_dep_parser_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludiscranrepository_@PALUDIS_PC_SLOT@.la
+cran_dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
cran_installed_repository_TEST_SOURCES = cran_installed_repository_TEST.cc
cran_installed_repository_TEST_LDADD = \
@@ -79,6 +81,8 @@ cran_installed_repository_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
+cran_installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
cran_repository_TEST_SOURCES = cran_repository_TEST.cc
cran_repository_TEST_LDADD = \
@@ -90,6 +94,8 @@ cran_repository_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
+cran_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
description_file_TEST_SOURCES = description_file_TEST.cc
description_file_TEST_LDADD = \
@@ -101,6 +107,8 @@ description_file_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
+description_file_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
EXTRA_DIST = \
cran_repository_TEST.cc \
cran_repository_TEST_setup.sh \
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 36485c2..f94aa54 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -161,7 +161,7 @@ e_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-e_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+e_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
@@ -175,7 +175,7 @@ vdb_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-vdb_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+vdb_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
exndbam_repository_TEST_SOURCES = exndbam_repository_TEST.cc
@@ -189,7 +189,7 @@ exndbam_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-exndbam_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+exndbam_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
vdb_merger_TEST_SOURCES = vdb_merger_TEST.cc
@@ -202,7 +202,7 @@ vdb_merger_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-vdb_merger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+vdb_merger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc
@@ -215,7 +215,7 @@ vdb_unmerger_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
e_repository_sets_TEST_SOURCES = e_repository_sets_TEST.cc
@@ -230,7 +230,7 @@ e_repository_sets_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-e_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+e_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
dep_spec_pretty_printer_TEST_SOURCES = dep_spec_pretty_printer_TEST.cc
@@ -244,6 +244,8 @@ dep_spec_pretty_printer_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+dep_spec_pretty_printer_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
dep_parser_TEST_SOURCES = dep_parser_TEST.cc
dep_parser_TEST_LDADD = \
@@ -256,6 +258,8 @@ dep_parser_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
aa_visitor_TEST_SOURCES = aa_visitor_TEST.cc
aa_visitor_TEST_LDADD = \
@@ -268,6 +272,8 @@ aa_visitor_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+aa_visitor_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
fetch_visitor_TEST_SOURCES = fetch_visitor_TEST.cc
fetch_visitor_TEST_LDADD = \
@@ -280,6 +286,8 @@ fetch_visitor_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+fetch_visitor_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
source_uri_finder_TEST_SOURCES = source_uri_finder_TEST.cc
source_uri_finder_TEST_LDADD = \
@@ -292,6 +300,8 @@ source_uri_finder_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+source_uri_finder_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
fix_locked_dependencies_TEST_SOURCES = fix_locked_dependencies_TEST.cc
fix_locked_dependencies_TEST_LDADD = \
@@ -304,6 +314,8 @@ fix_locked_dependencies_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+fix_locked_dependencies_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
ebuild_flat_metadata_cache_TEST_SOURCES = ebuild_flat_metadata_cache_TEST.cc
ebuild_flat_metadata_cache_TEST_LDADD = \
@@ -316,7 +328,7 @@ ebuild_flat_metadata_cache_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-ebuild_flat_metadata_cache_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+ebuild_flat_metadata_cache_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
EXTRA_DIST = \
aa_visitor_TEST.cc \
@@ -444,6 +456,8 @@ xml_things_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+xml_things_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
endif
paludis_datadir = $(datadir)/paludis
diff --git a/paludis/repositories/e/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index 6bd4dbb..c70c3e7 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -173,6 +173,8 @@ spec_keys_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+spec_keys_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
stray_files_TEST_SOURCES = stray_files_TEST.cc
stray_files_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -184,6 +186,8 @@ stray_files_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+stray_files_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
extractors_TEST_SOURCES = extractors_TEST.cc
extractors_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -195,6 +199,8 @@ extractors_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+extractors_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
homepage_key_TEST_SOURCES = homepage_key_TEST.cc
homepage_key_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -206,6 +212,8 @@ homepage_key_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+homepage_key_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
visibility_TEST_SOURCES = visibility_TEST.cc
visibility_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -217,6 +225,8 @@ visibility_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+visibility_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
default_functions_TEST_SOURCES = default_functions_TEST.cc
default_functions_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -228,6 +238,8 @@ default_functions_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+default_functions_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
kv_variables_TEST_SOURCES = kv_variables_TEST.cc
kv_variables_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -239,6 +251,8 @@ kv_variables_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+kv_variables_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
misc_files_TEST_SOURCES = misc_files_TEST.cc
misc_files_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -250,6 +264,8 @@ misc_files_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+misc_files_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
manifest_TEST_SOURCES = manifest_TEST.cc
manifest_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -261,6 +277,8 @@ manifest_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+manifest_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
subshell_die_TEST_SOURCES = subshell_die_TEST.cc
subshell_die_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -272,6 +290,8 @@ subshell_die_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+subshell_die_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
function_keyword_TEST_SOURCES = function_keyword_TEST.cc
function_keyword_TEST_LDADD = \
libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
@@ -283,6 +303,8 @@ function_keyword_TEST_LDADD = \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+function_keyword_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
endif
built-sources : $(BUILT_SOURCES)
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index c0a0831..25514b6 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -39,6 +39,8 @@ fake_repository_TEST_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+fake_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
fake_installed_repository_TEST_LDADD = \
libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
@@ -47,6 +49,8 @@ fake_installed_repository_TEST_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+fake_installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
dep_parser_TEST_LDADD = \
libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
@@ -55,6 +59,8 @@ dep_parser_TEST_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
fake_repository_TEST_SOURCES = \
fake_repository_TEST.cc
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 349efda..e759f68 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -95,11 +95,11 @@ gem_specifications_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
-lsyck
-gems_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
-installed_gems_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
-yaml_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
-gem_specification_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
-gem_specifications_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+gems_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+installed_gems_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+yaml_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+gem_specification_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+gem_specifications_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
EXTRA_DIST = \
installed_gems_repository_TEST.cc \
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index 53761df..b03fe69 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -50,6 +50,8 @@ unavailable_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+unavailable_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
EXTRA_DIST = \
unavailable_repository_TEST.cc \
unavailable_repository_TEST_setup.sh \
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index 8d0be18..8688874 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -56,6 +56,8 @@ unpackaged_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+unpackaged_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
installed_repository_TEST_SOURCES = installed_repository_TEST.cc
installed_repository_TEST_LDADD = \
@@ -67,6 +69,8 @@ installed_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
dep_parser_TEST_SOURCES = dep_parser_TEST.cc
dep_parser_TEST_LDADD = \
@@ -78,6 +82,8 @@ dep_parser_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
EXTRA_DIST = \
unpackaged_repository_TEST.cc \
unpackaged_repository_TEST_setup.sh \
diff --git a/paludis/repositories/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
index b297434..1e8a674 100644
--- a/paludis/repositories/unwritten/Makefile.am
+++ b/paludis/repositories/unwritten/Makefile.am
@@ -49,6 +49,8 @@ unwritten_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
+unwritten_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
EXTRA_DIST = \
unwritten_repository_TEST.cc \
unwritten_repository_TEST_setup.sh \
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index 9c76714..a7fd2e2 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -75,6 +75,8 @@ virtuals_repository_TEST_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+virtuals_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
installed_virtuals_repository_TEST_LDADD = \
libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
@@ -84,6 +86,8 @@ installed_virtuals_repository_TEST_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
+installed_virtuals_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
virtuals_repository_TEST_SOURCES = \
virtuals_repository_TEST.cc
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index d1e5d42..18a9efd 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -19,7 +19,7 @@ $1_TEST_LDADD = \
test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludisutil_@PALUDIS_PC_SLOT@.la
-$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS)
+$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
diff --git a/python/Makefile.am b/python/Makefile.am
index 4c18ff6..7318cd2 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -10,11 +10,8 @@ AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
@PALUDIS_CXXFLAGS_NO_WWRITE_STRINGS@ \
@PALUDIS_CXXFLAGS_NO_WMISSING_NORETURN@ \
@PALUDIS_CXXFLAGS_VISIBILITY@ \
- @PALUDIS_CXXFLAGS_NO_STRICT_ALIASING@
-
-# need this to go after the user's flags. -g is useless in here anyway,
-# and boost.python makes g++ eat silly amounts of memory.
-CXXFLAGS += @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+ @PALUDIS_CXXFLAGS_NO_STRICT_ALIASING@ \
+ @PALUDIS_CXXFLAGS_NO_DEBUGGING@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/src/clients/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
index 3ff99f9..c0a4983 100644
--- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am
+++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
@@ -32,6 +32,7 @@ configuration_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a
+configuration_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/clients/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am
index d0801b4..2a8fe33 100644
--- a/src/clients/reconcilio/util/Makefile.am
+++ b/src/clients/reconcilio/util/Makefile.am
@@ -28,6 +28,8 @@ realpath_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a
+realpath_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
wildcard_expander_TEST_SOURCES = wildcard_expander_TEST.cc
wildcard_expander_TEST_LDADD = \
libreconcilioutil.a \
@@ -35,6 +37,8 @@ wildcard_expander_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a
+wildcard_expander_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
diff --git a/test/Makefile.am b/test/Makefile.am
index 76322ec..220d24b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,9 +26,11 @@ check_SCRIPTS = run_test.sh
test_pass_TEST_SOURCES = test_pass_TEST.cc
test_pass_TEST_LDADD = libtest.a
+test_pass_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
test_fail_TEST_SOURCES = test_fail_TEST.cc
test_fail_TEST_LDADD = libtest.a
+test_fail_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done