Enable exception handling for CxxTest in Makefiles

(bzr r6524)

7 files changed, 7 insertions, 7 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 09e52576b..3dc9e7cd7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -256,7 +256,7 @@ check_PROGRAMS =	\
 
 test-src.cpp: \
 		$(test_src_includes)
-		$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-src.cpp	\
+		$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh --template=$(srcdir)/selfname.tpl -root -o test-src.cpp	\
 		$(test_src_includes)
 
 test_src_SOURCES = \
diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 7db15cf39..9857cd386 100644
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -136,7 +136,7 @@ display/test-display-main.cpp: display/test-display.cpp
 	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o display/test-display-main.cpp $(display_test_display_includes)
 
 display/test-display.cpp: $(display_test_display_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o display/test-display.cpp $(display_test_display_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o display/test-display.cpp $(display_test_display_includes)
 
 display_test_display_includes = \
 	$(srcdir)/display/bezier-utils-test.h \
diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert
index 26b2f46b2..432b3861c 100644
--- a/src/helper/Makefile_insert
+++ b/src/helper/Makefile_insert
@@ -61,7 +61,7 @@ helper/test-helper-main.cpp: helper/test-helper.cpp
 	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o helper/test-helper-main.cpp $(helper_test_helper_includes)
 
 helper/test-helper.cpp: $(helper_test_helper_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o helper/test-helper.cpp $(helper_test_helper_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o helper/test-helper.cpp $(helper_test_helper_includes)
 
 helper_test_helper_includes = \
 	$(srcdir)/helper/units-test.h
diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 1ddc7d880..3b99f8d39 100644
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -110,7 +110,7 @@ libnr/test-nr-main.cpp: libnr/test-nr.cpp
 	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
 
 libnr/test-nr.cpp: $(libnr_test_nr_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
 
 libnr_test_nr_includes = \
 	$(srcdir)/libnr/nr-compose-test.h	\
diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert
index 48d945301..e8f31b3c8 100644
--- a/src/svg/Makefile_insert
+++ b/src/svg/Makefile_insert
@@ -42,7 +42,7 @@ svg/test-svg-main.cpp: svg/test-svg.cpp
 	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o svg/test-svg-main.cpp $(svg_test_svg_includes)
 
 svg/test-svg.cpp: $(svg_test_svg_includes) svg/Makefile_insert
-	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o svg/test-svg.cpp $(svg_test_svg_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o svg/test-svg.cpp $(svg_test_svg_includes)
 
 svg_test_svg_includes = \
 	$(srcdir)/svg/css-ostringstream-test.h	\
diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index 23ed42ac8..e4a89d046 100644
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -32,7 +32,7 @@ util/test-util-main.cpp: util/test-util.cpp
 	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o util/test-util-main.cpp $(util_test_util_includes)
 
 util/test-util.cpp: $(util_test_util_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o util/test-util.cpp $(util_test_util_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o util/test-util.cpp $(util_test_util_includes)
 
 util_test_util_includes = \
 	$(srcdir)/util/list-container-test.h
diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert
index 2027b38d1..46be9edfa 100644
--- a/src/xml/Makefile_insert
+++ b/src/xml/Makefile_insert
@@ -56,7 +56,7 @@ xml/test-xml-main.cpp: xml/test-xml.cpp $(xml_test_xml_includes)
 	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o xml/test-xml-main.cpp $(xml_test_xml_includes)
 
 xml/test-xml.cpp: $(xml_test_xml_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl -part -o xml/test-xml.cpp $(xml_test_xml_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o xml/test-xml.cpp $(xml_test_xml_includes)
 
 xml_test_xml_includes = \
 	$(srcdir)/xml/repr-action-test.h	\