more build system fix-ups

3 files changed, 22 insertions, 9 deletions

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index 61eef32d5..f05a74bcf 100644
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -7,7 +7,7 @@ UNIT_TESTS = \
 
 # things that aren't tests but that tests rely on and need to
 # go into the distribution
-TEST_DEPENDENCIES =
+TEST_DEPS =
 
 if HAVE_CXXTESTGEN
 
@@ -21,10 +21,10 @@ AM_CXXFLAGS_WHITE = -fno-access-control
 AM_CXXFLAGS_BLACK =
 AM_CXXFLAGS_PUBLIC =
 AM_LDFLAGS_WHITE = \
-	@abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ 
+	@abs_top_builddir@/src/parser/libcvc4parser_noinst.la \
 	@abs_top_builddir@/src/libcvc4_noinst.la
 AM_LDFLAGS_BLACK = \
-	@abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ 
+	@abs_top_builddir@/src/parser/libcvc4parser_noinst.la \
 	@abs_top_builddir@/src/libcvc4_noinst.la
 AM_LDFLAGS_PUBLIC = \
 	@abs_top_builddir@/src/libcvc4.la
@@ -33,7 +33,7 @@ TESTS = $(UNIT_TESTS)
 
 EXTRA_DIST = \
 	no_cxxtest \
-	$(TEST_DEPENDENCIES)
+	$(TEST_DEPS)
 
 # without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-(
 noinst_LTLIBRARIES = libdummy.la
@@ -62,6 +62,6 @@ TESTS = no_cxxtest
 
 EXTRA_DIST = \
 	$(UNIT_TESTS) \
-	$(TEST_DEPENDENCIES)
+	$(TEST_DEPS)
 
 endif
diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in
index 6e518d527..a3bb01929 100644
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -224,7 +224,7 @@ UNIT_TESTS = \
 
 # things that aren't tests but that tests rely on and need to
 # go into the distribution
-TEST_DEPENDENCIES = 
+TEST_DEPS = 
 @HAVE_CXXTESTGEN_TRUE@AM_CPPFLAGS = \
 @HAVE_CXXTESTGEN_TRUE@	-I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" \
 @HAVE_CXXTESTGEN_TRUE@	$(TEST_CPPFLAGS)
@@ -251,11 +251,11 @@ TEST_DEPENDENCIES =
 @HAVE_CXXTESTGEN_TRUE@TESTS = $(UNIT_TESTS)
 @HAVE_CXXTESTGEN_FALSE@EXTRA_DIST = \
 @HAVE_CXXTESTGEN_FALSE@	$(UNIT_TESTS) \
-@HAVE_CXXTESTGEN_FALSE@	$(TEST_DEPENDENCIES)
+@HAVE_CXXTESTGEN_FALSE@	$(TEST_DEPS)
 
 @HAVE_CXXTESTGEN_TRUE@EXTRA_DIST = \
 @HAVE_CXXTESTGEN_TRUE@	no_cxxtest \
-@HAVE_CXXTESTGEN_TRUE@	$(TEST_DEPENDENCIES)
+@HAVE_CXXTESTGEN_TRUE@	$(TEST_DEPS)
 
 
 # without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-(
diff --git a/test/unit/parser/smt/smt_parser_black.h b/test/unit/parser/smt/smt_parser_black.h
index 3b4b81239..7ec46b16c 100644
--- a/test/unit/parser/smt/smt_parser_black.h
+++ b/test/unit/parser/smt/smt_parser_black.h
@@ -1,4 +1,17 @@
-/* Black box testing of smt4::parser:SmtParser. */
+/*********************                                           -*- C++ -*-  */
+/** smt_parser_black.h
+ ** Original author: cconway
+ ** Major contributors: none
+ ** Minor contributors (to current version): none
+ ** This file is part of the CVC4 prototype.
+ ** Copyright (c) 2009 The Analysis of Computer Systems Group (ACSys)
+ ** Courant Institute of Mathematical Sciences
+ ** New York University
+ ** See the file COPYING in the top-level source directory for licensing
+ ** information.
+ **
+ ** Black box testing of CVC4::parser::SmtParser.
+ **/
 
 #include <cxxtest/TestSuite.h>
 //#include <string>