* tests/Makefile.am (COMMON_TESTS): New variable.

(CXX_TESTS): Define unconditionally.
(TESTS): Move all tests to COMMON_TESTS, and conditionally
include CXX_TESTS.
(EXTRA_DIST): Don't use $(TESTS).

diff --git a/ChangeLog b/ChangeLog
index 70c565b1b72ffbce7e881f55313879884e3d0ad6..b12d3255503cf3666d1bb0f6b9a1582e63e0c3aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-24  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * tests/Makefile.am (COMMON_TESTS): New variable.
+       (CXX_TESTS): Define unconditionally.
+       (TESTS): Move all tests to COMMON_TESTS, and conditionally
+       include CXX_TESTS.
+       (EXTRA_DIST): Don't use $(TESTS).
+
 2000-07-24  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
        * ltcf-c.sh (linkopts): Don't set for test.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d2dc1d8ff8d7fff3e8296c7c354322e13641d1e6..16b141c60bc5362a730e12f6802fbe10fca3a846 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,14 +2,13 @@
 
 AUTOMAKE_OPTIONS = gnits
 
-if HAVE_CXX
 CXX_TESTS = \
        tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
        tagdemo-conf.test tagdemo-make.test tagdemo-exec.test \
        tagdemo-shared.test tagdemo-make.test tagdemo-exec.test
-endif
 
-TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \
+COMMON_TESTS = \
+       cdemo-static.test cdemo-make.test cdemo-exec.test \
        demo-static.test demo-make.test demo-exec.test \
        demo-inst.test demo-unst.test \
        depdemo-static.test depdemo-make.test depdemo-exec.test \
@@ -37,7 +36,13 @@ TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \
        mdemo-shared.test mdemo-make.test mdemo-exec.test \
        mdemo-inst.test mdemo-unst.test \
        assign.test link.test link-2.test nomode.test \
-       quote.test sh.test suffix.test $(CXX_TESTS)
+       quote.test sh.test suffix.test
+
+if HAVE_CXX
+TESTS = $(COMMON_TESTS) $(CXX_TESTS)
+else
+TESTS = $(COMMON_TESTS)
+endif
 
 demo-conf.test: $(top_builddir)/libtool
 
@@ -55,7 +60,7 @@ TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
        LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)"
 
-EXTRA_DIST = defs $(TESTS)
+EXTRA_DIST = defs $(COMMON_TESTS) $(CXX_TESTS)
 
 # We need to remove any files that the above tests created.
 clean-local: