[PPL-devel] [GIT] ppl/ppl(master): Force C++ linking for all the test programs.

[Roberto Bagnara]

Module: ppl/ppl
Branch: master
Commit: c67f2c8566da2ac85d52042ce95134e47de1d2e9
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c67f2c8566da2ac85d52042ce95134e47de1d2e9

Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date:   Sat Feb 27 08:58:00 2010 +0100

Force C++ linking for all the test programs.

---

 interfaces/C/tests/Makefile.am |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am
index a4545d2..424607d 100644
--- a/interfaces/C/tests/Makefile.am
+++ b/interfaces/C/tests/Makefile.am
@@ -76,12 +76,17 @@ formatted_output.c \
 print_to_buffer.h \
 print_to_buffer.c
 
+# Dummy C++ source to cause C++ linking.
+# FIXME: why isn't enough to do this for libppl_c_tests.a?
+nodist_EXTRA_formatted_output_SOURCES = \
+dummy.cc
+
 pip_test_SOURCES = \
 pip_test.c
 
 # Dummy C++ source to cause C++ linking.
 # FIXME: why isn't enough to do this for libppl_c_tests.a?
-nodist_EXTRA_formatted_output_SOURCES = \
+nodist_EXTRA_pip_test_SOURCES = \
 dummy.cc
 
 watchdog1_SRCS = watchdog1.c
@@ -110,10 +115,21 @@ watchdog1_SOURCES = $(watchdog1_SRCS)
 watchdog1_CPPFLAGS = $(WATCHDOG_LIBRARY_CPPFLAGS)
 watchdog1_LDADD = $(WATCHDOG_LIBRARY_LDADD)
 
+# Dummy C++ source to cause C++ linking.
+# FIXME: why isn't enough to do this for libppl_c_tests.a?
+nodist_EXTRA_watchdog1_SOURCES = \
+dummy.cc
+
+
 weightwatch1_SOURCES = $(weightwatch1_SRCS)
 weightwatch1_CPPFLAGS = $(WATCHDOG_LIBRARY_CPPFLAGS)
 weightwatch1_LDADD = $(WATCHDOG_LIBRARY_LDADD)
 
+# Dummy C++ source to cause C++ linking.
+# FIXME: why isn't enough to do this for libppl_c_tests.a?
+nodist_EXTRA_weightwatch1_SOURCES = \
+dummy.cc
+
 endif BUILD_WATCHDOG_LIBRARY
 
 TESTS = $(NORMAL_TESTS) $(WATCHDOG_TESTS)