build system cleanup; test system separation into white-box, black-box, and public...

diff --git a/Makefile b/Makefile
index 01bf537bc7bfe5e04d3daec17bcaeda755834aab..aa8ebf2329e9e28b4c647b2c13516e48427ad6c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
-builddir = builds
+topdir = .
+srcdir = .
 
 include Makefile.subdir

diff --git a/Makefile.subdir b/Makefile.subdir
index 6aa62bf285608b8b34032ee2b73b647ed1fdae07..da450345bc17b4b0364b788804bc4ba2c5257e76 100644 (file)
--- a/Makefile.subdir
+++ b/Makefile.subdir
@@ -1,3 +1,6 @@
+include $(topdir)/builds/current
+builddir = $(topdir)/builds/$(CURRENT_BUILD)/$(srcdir)
+
 .PHONY: _default_build_
 _default_build_: all
 %:

diff --git a/src/Makefile b/src/Makefile
index e119c83d78d9e4e3ae22f98980dda471a6d286a0..dc23e22722f086c401e520f34ae66a6cb6e491f5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,4 @@
 topdir = ..
 srcdir = src
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/context/Makefile b/src/context/Makefile
index 5286dd3ac3a041a85ba17c938150d1cfa2ed9150..44ac0f2e6b91c0fa99dbb2d46d9b1a7a44a23b2a 100644 (file)
--- a/src/context/Makefile
+++ b/src/context/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/context
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/expr/Makefile b/src/expr/Makefile
index b661835a54e04e29d3d4e4adfdcdcb73f017a014..eff3b332eb20244b6a645df09288daca25a09574 100644 (file)
--- a/src/expr/Makefile
+++ b/src/expr/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/expr
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/main/Makefile b/src/main/Makefile
index 6866749060b13f01075ca18ccd06070a7ecff7c3..5e936ee061d6057078e5dfbdb0188a18fd390fb4 100644 (file)
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/main
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/parser/Makefile b/src/parser/Makefile
index 1ea7edf5d7388b230b0336aec58ced56f87476ff..cef81750ecd9a316c393c23519f4693c7ab6367b 100644 (file)
--- a/src/parser/Makefile
+++ b/src/parser/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/parser
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/parser/cvc/Makefile b/src/parser/cvc/Makefile
index c91554a474c05e8ac07fee565fddd5395c9c313e..cbcc0a4935f78d2f4125d588a188f3d7d8343138 100644 (file)
--- a/src/parser/cvc/Makefile
+++ b/src/parser/cvc/Makefile
@@ -1,5 +1,4 @@
 topdir = ../../..
 srcdir = src/parser/cvc
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/parser/smt/Makefile b/src/parser/smt/Makefile
index aa3e74236676292ae3954e080913f21f030c7f22..7e97ed35780f9676eaf247feb0c89705257f7c7a 100644 (file)
--- a/src/parser/smt/Makefile
+++ b/src/parser/smt/Makefile
@@ -1,5 +1,4 @@
 topdir = ../../..
 srcdir = src/parser/smt
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/prop/Makefile b/src/prop/Makefile
index 79fe1084b8cebcd4858ef4393d8fa26b803ae4f1..08f0c693c39a08907dd44589d8205ce0bce1ccac 100644 (file)
--- a/src/prop/Makefile
+++ b/src/prop/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/prop
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/prop/minisat/Makefile b/src/prop/minisat/Makefile
index 49512a1cdb183558f1da9215a0f26772529e411a..e8b442ac165bc2e31a59323e7a3e6033121d8f79 100644 (file)
--- a/src/prop/minisat/Makefile
+++ b/src/prop/minisat/Makefile
@@ -1,5 +1,4 @@
 topdir = ../../..
 srcdir = src/prop/minisat
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/smt/Makefile b/src/smt/Makefile
index 84a43ff395369cc9a878d2ab6bd8931169639a61..7103b6d21f6412f0204255503585a008c61efb2d 100644 (file)
--- a/src/smt/Makefile
+++ b/src/smt/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/smt
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/theory/Makefile b/src/theory/Makefile
index 2a4a03491afd3ded7d131ede56216edac8efefc2..da7d0e6b93fd00b62091f3c133b23c48510143b3 100644 (file)
--- a/src/theory/Makefile
+++ b/src/theory/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/theory
-builddir = $(topdir)/$(builds)/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/theory/uf/Makefile b/src/theory/uf/Makefile
index 524ff2009b8081a0478bccdc885271f0cfe837a5..c3c641384e205c7c0c455aae937bfee422ee8144 100644 (file)
--- a/src/theory/uf/Makefile
+++ b/src/theory/uf/Makefile
@@ -1,5 +1,4 @@
 topdir = ../../..
 srcdir = src/theory/uf
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/src/util/Makefile b/src/util/Makefile
index 0bd2f197bbf478ed1da3d780a025ae4f86f30ed4..ea908704966ad78a59257ab010dbb160e24cdd01 100644 (file)
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = src/util
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/test/Makefile b/test/Makefile
index 80f8a1dd5894c23ff6a620b1d288079a87e0b873..ba9d1278856247374510beb5a3156fc69c497ff6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,4 @@
 topdir = ..
 srcdir = test
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/test/regress/Makefile b/test/regress/Makefile
index c4e305306cfa9050f4aadc6aaf2b2ffbd05a4e27..2946f5217a18bf26f1b470b4a6c3705a57d15f2f 100644 (file)
--- a/test/regress/Makefile
+++ b/test/regress/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = test/regress
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/test/unit/Makefile b/test/unit/Makefile
index f3f3767aabdd118f436bb48a33bac011ab007dbb..190a41bb0c972bf1e1aa0c1f88208d7652acaf0c 100644 (file)
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -1,5 +1,4 @@
 topdir = ../..
 srcdir = test/unit
-builddir = $(topdir)/builds/$(srcdir)
 
 include $(topdir)/Makefile.subdir

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index 0a1239b81cbdb68ef38be34c0d3bb8fc27fe5501..ca85a779f1e50d48c75be832f9a389d0dac0b770 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -2,13 +2,20 @@ if HAVE_CXXTESTGEN
 
 AM_CPPFLAGS = \
        -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src"
-AM_LDFLAGS = \
+AM_CXXFLGAS_WHITE = -fno-access-control
+AM_CXXFLGAS_BLACK =
+AM_CXXFLGAS_PUBLIC =
+AM_LDFLAGS_WHITE = \
                @abs_top_builddir@/src/context/libcontext.la \
                @abs_top_builddir@/src/expr/libexpr.la \
                @abs_top_builddir@/src/smt/libsmt.la \
                @abs_top_builddir@/src/theory/libtheory.la \
                @abs_top_builddir@/src/util/libutil.la \
                @abs_top_builddir@/src/prop/minisat/libminisat.la
+AM_LDFLAGS_BLACK = \
+               $(AM_LDFLAGS_WHITE)
+AM_LDFLAGS_PUBLIC = \
+               @abs_top_builddir@/src/libcvc4.la
 
 TESTS_WHITE = \
        expr/node_white
@@ -16,9 +23,12 @@ TESTS_WHITE = \
 TESTS_BLACK = \
        expr/node_black
 
+TESTS_PUBLIC =
+
 TESTS = \
        $(TESTS_WHITE) \
-       $(TESTS_BLACK)
+       $(TESTS_BLACK) \
+       $(TESTS_PUBLIC)
 
 lib_LTLIBRARIES = libdummy.la
 libdummy_la_SOURCES = expr/node_black.cpp
@@ -30,13 +40,18 @@ $(TESTS:%=%.cpp): %.cpp: %.h
 $(TESTS_WHITE): %: %.cpp
 #      get these in here somehow
 #      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
-       $(LTCXXCOMPILE) -c -fno-access-control -o $@.lo $<
-       $(CXXLINK) $@.lo
+       $(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@.lo $<
+       $(CXXLINK) $(AM_LDFLAGS_WHITE) $@.lo
 $(TESTS_BLACK): %: %.cpp
 #      get these in here somehow
 #      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
-       $(LTCXXCOMPILE) -c -o $@.lo $<
-       $(CXXLINK) $@.lo
+       $(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@.lo $<
+       $(CXXLINK) $(AM_LDFLAGS_BLACK) $@.lo
+$(TESTS_PUBLIC): %: %.cpp
+#      get these in here somehow
+#      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
+       $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $<
+       $(CXXLINK) $(AM_LDFLAGS_PUBLIC) $@.lo
 
 MOSTLYCLEANFILES = $(TESTS) $(TESTS:%=%.cpp)
 

diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in
index d5c49cc78b12b39e4c8472f49069abdc04d613b5..5432c809e26c581559dbc8a4220ecfa4457beb64 100644 (file)
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -35,6 +35,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+@HAVE_CXXTESTGEN_FALSE@TESTS = no_cxxtest
+@HAVE_CXXTESTGEN_TRUE@TESTS = $(TESTS_WHITE) $(TESTS_BLACK) \
+@HAVE_CXXTESTGEN_TRUE@ $(am__EXEEXT_1)
 subdir = test/unit
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -98,6 +101,7 @@ ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
+am__EXEEXT_1 =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -238,7 +242,10 @@ top_srcdir = @top_srcdir@
 @HAVE_CXXTESTGEN_TRUE@AM_CPPFLAGS = \
 @HAVE_CXXTESTGEN_TRUE@ -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src"
 
-@HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS = \
+@HAVE_CXXTESTGEN_TRUE@AM_CXXFLGAS_WHITE = -fno-access-control
+@HAVE_CXXTESTGEN_TRUE@AM_CXXFLGAS_BLACK = 
+@HAVE_CXXTESTGEN_TRUE@AM_CXXFLGAS_PUBLIC = 
+@HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_WHITE = \
 @HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/context/libcontext.la \
 @HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/expr/libexpr.la \
 @HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/smt/libsmt.la \
@@ -246,19 +253,19 @@ top_srcdir = @top_srcdir@
 @HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/util/libutil.la \
 @HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/prop/minisat/libminisat.la
 
+@HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_BLACK = \
+@HAVE_CXXTESTGEN_TRUE@         $(AM_LDFLAGS_WHITE)
+
+@HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_PUBLIC = \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/libcvc4.la
+
 @HAVE_CXXTESTGEN_TRUE@TESTS_WHITE = \
 @HAVE_CXXTESTGEN_TRUE@ expr/node_white
 
 @HAVE_CXXTESTGEN_TRUE@TESTS_BLACK = \
 @HAVE_CXXTESTGEN_TRUE@ expr/node_black
 
-
-# force a user-visible failure for "make check"
-@HAVE_CXXTESTGEN_FALSE@TESTS = no_cxxtest
-@HAVE_CXXTESTGEN_TRUE@TESTS = \
-@HAVE_CXXTESTGEN_TRUE@ $(TESTS_WHITE) \
-@HAVE_CXXTESTGEN_TRUE@ $(TESTS_BLACK)
-
+@HAVE_CXXTESTGEN_TRUE@TESTS_PUBLIC = 
 @HAVE_CXXTESTGEN_TRUE@lib_LTLIBRARIES = libdummy.la
 @HAVE_CXXTESTGEN_TRUE@libdummy_la_SOURCES = expr/node_black.cpp
 @HAVE_CXXTESTGEN_TRUE@libdummy_la_LIBADD = @abs_top_builddir@/src/libcvc4.la
@@ -675,13 +682,18 @@ uninstall-am: uninstall-libLTLIBRARIES
 @HAVE_CXXTESTGEN_TRUE@$(TESTS_WHITE): %: %.cpp
 #      get these in here somehow
 #      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
-@HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) -c -fno-access-control -o $@.lo $<
-@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $@.lo
+@HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@.lo $<
+@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_WHITE) $@.lo
 @HAVE_CXXTESTGEN_TRUE@$(TESTS_BLACK): %: %.cpp
 #      get these in here somehow
 #      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
-@HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) -c -o $@.lo $<
-@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $@.lo
+@HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@.lo $<
+@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_BLACK) $@.lo
+@HAVE_CXXTESTGEN_TRUE@$(TESTS_PUBLIC): %: %.cpp
+#      get these in here somehow
+#      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
+@HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $<
+@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_PUBLIC) $@.lo
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.