* examples/calc++/Makefile.am (check_PROGRAMS): Renamed from

nodist_PROGRAMS, since we don't need to actually compile the
example if we're just doing a plain 'make'.  This avoids bothering
the installer unnecessarily about problems due to weird C++
compilers.

diff --git a/ChangeLog b/ChangeLog
index bfc43f0ccd429cb63da43ab225ae3a0764911dd1..f3d84ba2e846c4435617b2ebc12698ab17e19c4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       More portability fixes for problems summarized by Nelson H. F. Beebe.
+
+       * examples/calc++/Makefile.am (check_PROGRAMS): Renamed from
+       nodist_PROGRAMS, since we don't need to actually compile the
+       example if we're just doing a plain 'make'.  This avoids bothering
+       the installer unnecessarily about problems due to weird C++
+       compilers.
+
 2006-02-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        More portability fixes for problems summarized by Nelson H. F. Beebe.

diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
index 1456f2e7fd64054013196cda01db93bd49784509..fea49b173451a474f3d7372728d57f46ba7d4757 100644 (file)
--- a/examples/calc++/Makefile.am
+++ b/examples/calc++/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2005 Free Software Foundation, Inc.
+## Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ $(calc_sources_generated): $(srcdir)/calc++-parser.stamp
 ## Building & testing calc++.  ##
 ## --------------------------- ##
 
-noinst_PROGRAMS = calc++
+check_PROGRAMS = calc++
 
 calc_sources_extracted = $(srcdir)/calc++-scanner.ll $(srcdir)/calc++.cc \
        $(srcdir)/calc++-driver.hh $(srcdir)/calc++-driver.cc