From 51ca358ac75271c6ddd10cc0fd2460ba88a45015 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 10 May 2004 16:02:11 +0000 Subject: 2004-05-10 Ralf Corsepius * configure.ac: Add CXX-checks. New conditionals CXXTESTS, MPTESTS, NETTESTS. Add iostream/. * Makefile.am, base_mp/node1/Makefile.am, base_mp/node2/Makefile.am cdtest/Makefile.am, loopback/Makefile.am, pppd/Makefile.am: Reflect changes above. * cdtest/main.cc: Adaptation to new C++ standards. --- testsuites/samples/Makefile.am | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'testsuites/samples/Makefile.am') diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am index 07088554ef..fd763cb2a2 100644 --- a/testsuites/samples/Makefile.am +++ b/testsuites/samples/Makefile.am @@ -4,23 +4,27 @@ ACLOCAL_AMFLAGS = -I ../aclocal -CPLUSPLUS_TESTS = cdtest +SUBDIRS = hello ticker base_sp unlimited minimum fileio +if MPTESTS ## base_mp is a sample multiprocessing test -MP_TESTS = base_mp +SUBDIRS += base_mp +endif -FP_TESTS = paranoia +SUBDIRS += paranoia -## loopback tests a network loopback interface -NET_TESTS = loopback -NET_TESTS += pppd - -SUBDIRS = hello ticker base_sp unlimited minimum fileio $(MP_TESTS) \ - $(CPLUSPLUS_TESTS) $(FP_TESTS) $(NET_TESTS) +if CXXTESTS +SUBDIRS += iostream cdtest +endif -AUTOMAKE_FILES = sample.am +if NETTESTS +## loopback tests a network loopback interface +SUBDIRS += loopback +SUBDIRS += pppd +endif -EXTRA_DIST = $(AUTOMAKE_FILES) +DIST_SUBDIRS = hello ticker base_sp unlimited minimum fileio base_mp cdtest \ + paranoia loopback pppd include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/local.am -- cgit v1.2.3