From ef4867a2b481be042cbf337527bf296b5ddbb5d0 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Tue, 12 Apr 2011 18:45:44 +0000 Subject: [PATCH] another small fix to "make dist" that can lead to a misconfigured tarball --- src/util/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 9644aa12c..24d82f01c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -10,6 +10,13 @@ noinst_LTLIBRARIES = libutil.la libutilcudd.la libutilcudd_la_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) @CUDD_CPPFLAGS@ libutilcudd_la_LIBADD = @CUDD_LDFLAGS@ +# Do not list built sources (like integer.h, rational.h, and tls.h) here! +# Rather, list them under BUILT_SOURCES, and their .in versions under +# EXTRA_DIST. Otherwise, they're packaged up in the tarball, which is +# no good---they belong in the configured builds/ directory. If they +# end up in the source directory, they build the cvc4 that was +# configured at the time of the "make dist", which (1) may not be the +# configuration that the user wants, and (2) might cause link errors. libutil_la_SOURCES = \ Assert.h \ Assert.cpp \ @@ -29,8 +36,6 @@ libutil_la_SOURCES = \ configuration.h \ configuration_private.h \ configuration.cpp \ - rational.h \ - integer.h \ bitvector.h \ gmp_util.h \ sexpr.h \ -- 2.30.2