coding standard fix on SmtEngine; fix recursive make

diff --git a/Makefile b/Makefile
index aa8ebf2329e9e28b4c647b2c13516e48427ad6c3..43fd2e3b1464b3339f4a7ca6df4aa0b863a67028 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,15 @@
-topdir = .
-srcdir = .
+builddir = builds
 
-include Makefile.subdir
+.PHONY: _default_build_ all
+_default_build_: all
+all %:
+       @if test -e $(builddir); then \
+               echo cd $(builddir); \
+               cd $(builddir); \
+               echo $(MAKE) $@; \
+               $(MAKE) $@; \
+       else \
+               echo; \
+               echo 'Run configure first, or type "make" in a configured build directory.'; \
+               echo; \
+       fi

diff --git a/Makefile.am b/Makefile.am
index 07a91f21a496d31647c99f4ae983dfc1d902076c..20d6298f456ba17ff20edf52e364067fb3984c78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,4 +16,3 @@ production debug default competition:
        else \
                ./configure --with-build=$@ $(CONFARGS) && $(MAKE); \
        fi
-

diff --git a/Makefile.builds.in b/Makefile.builds.in
index 0955518bf739abc6ef3f99c54fedd8821ac35e49..00551ea6f393410a11d55c27076ca281d05a54d7 100644 (file)
--- a/Makefile.builds.in
+++ b/Makefile.builds.in
@@ -12,11 +12,10 @@ bindir = @bindir@
 libdir = @libdir@
 abs_builddir = @abs_builddir@
 
-.PHONY: _default_build_
+.PHONY: _default_build_ all
 _default_build_: all
 all:
        (cd $(CURRENT_BUILD) && $(MAKE) $@)
-       # populate builds/$(CURRENT_BUILD)/bin and builds/$(CURRENT_BUILD)/lib
        $(mkinstalldirs) "$(CURRENT_BUILD)$(bindir)" "$(CURRENT_BUILD)$(libdir)"
        $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/libcvc4.la "$(abs_builddir)$(libdir)"
        $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/parser/libcvc4parser.la "$(abs_builddir)$(libdir)"
@@ -25,7 +24,6 @@ all:
                eval "(cd $(CURRENT_BUILD)/src/main && $$relink_command)"
        test -e $(CURRENT_BUILD)/lib || ln -sfv "$(abs_builddir)$(libdir)" $(CURRENT_BUILD)/lib
        test -e $(CURRENT_BUILD)/bin || ln -sfv "$(abs_builddir)$(bindir)" $(CURRENT_BUILD)/bin
-       # populate builds/bin and builds/lib
        mkdir -pv ".$(bindir)" ".$(libdir)"
        $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/libcvc4.la "`pwd`$(libdir)"
        $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/parser/libcvc4parser.la "`pwd`$(libdir)"

diff --git a/Makefile.reconf_args b/Makefile.reconf_args
index 10d3c84b987c18cc357fed340e41d289bbb67fe8..516ae0adbc6bc3856582de8f2932375169814239 100644 (file)
--- a/Makefile.reconf_args
+++ b/Makefile.reconf_args
@@ -1,3 +1,4 @@
+# -*-makefile-*-
 # This makefile snippet maps make-time arguments to configure and
 # build-type arguments
 #

diff --git a/Makefile.subdir b/Makefile.subdir
index da450345bc17b4b0364b788804bc4ba2c5257e76..590b3ea4ed2d6cd07437aefd554f0ce2da6b6d76 100644 (file)
--- a/Makefile.subdir
+++ b/Makefile.subdir
@@ -1,7 +1,8 @@
+# -*-makefile-*-
 include $(topdir)/builds/current
 builddir = $(topdir)/builds/$(CURRENT_BUILD)/$(srcdir)
 
-.PHONY: _default_build_
+.PHONY: _default_build_ all
 _default_build_: all
 %:
        @if test -e $(builddir); then \

diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index f07ad577e829103a0e82e98b3ae50f3ae0121069..23dc1153abb4f818ad4f83388e619c0dc62a6535 100644 (file)
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -40,8 +40,9 @@ Node SmtEngine::processAssertionList() {
   Node asserts;
   for(std::vector<Node>::iterator i = d_assertions.begin();
       i != d_assertions.end();
-      ++i)
+      ++i) {
     asserts = asserts.isNull() ? *i : d_em->mkNode(AND, asserts, *i);
+  }
   return asserts;
 }