Some fixes to build system with dependency-tracking is off; should fix RPM/Debian...

diff --git a/config/cvc4.m4 b/config/cvc4.m4
index 1b241feb41fbcf8a487822a7d157cc07e68feec1..27ac51521cd9e29a45f21964f881f5e46db0d898 100644 (file)
--- a/config/cvc4.m4
+++ b/config/cvc4.m4
@@ -69,7 +69,6 @@ do
       AC_MSG_ERROR([personal build profile selected, but cannot find personal.conf])
     fi
   else
-echo "calling for $ac_option"
     handle_option "$ac_option"
   fi
 done

diff --git a/src/Makefile.am b/src/Makefile.am
index 8932af26dec708b60b1b2461a5132c0d401004cc..a056c1d84ce78eedaa9a4ff4e3b601c0f49ab86e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -597,4 +597,3 @@ theory/type_enumerator.cpp: theory/type_enumerator_template.cpp theory/mktheoryt
                $< \
                `cat @top_builddir@/src/theory/.subdirs` \
        > $@) || (rm -f $@ && exit 1)
-

diff --git a/src/options/mkoptions b/src/options/mkoptions
index d856c7293485b982245c3b77bc7c449e30437ac4..2ff857a2f56b9de018f04d6cccecdc45584e4ce3 100755 (executable)
--- a/src/options/mkoptions
+++ b/src/options/mkoptions
@@ -1346,6 +1346,7 @@ function output_module {
   nl -ba -s' ' "$template"  | grep '^ *[0-9][0-9]* # *line' |
     awk '{OFS="";if($1+1!=$3) print "'"$template"':",$1,": warning: incorrect annotation \"#line ",$3,"\" (it should be \"#line ",($1+1),"\")"}' >&2
 
+  mkdir -p "`dirname "$output"`"
   cp "$template" "$output.working"
   echo -n > "$output.sed"
   for var in \

diff --git a/src/theory/Makefile.subdirs b/src/theory/Makefile.subdirs
index bcaef2b87e84ec3c63d7a4c33723908b6ff46ddf..42582c67fdb7bab8a25a0358b1bdd9cc56e9fd5c 100644 (file)
--- a/src/theory/Makefile.subdirs
+++ b/src/theory/Makefile.subdirs
@@ -1,7 +1,7 @@
 $(top_builddir)/src/theory/.subdirs: $(top_srcdir)/src/Makefile.am
+       $(AM_V_at)test -d $(top_builddir)/src/theory || mkdir $(top_builddir)/src/theory
        $(AM_V_at)grep '^THEORIES = ' $(abs_top_srcdir)/src/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -I__D__ echo $(abs_top_srcdir)/src/theory/__D__/kinds >$(abs_top_builddir)/src/theory/.subdirs.tmp
        @if ! diff -q $(abs_top_builddir)/src/theory/.subdirs $(abs_top_builddir)/src/theory/.subdirs.tmp &>/dev/null; then \
                echo "  GEN   " $@; \
                $(am__mv) $(abs_top_builddir)/src/theory/.subdirs.tmp $(abs_top_builddir)/src/theory/.subdirs; \
        fi
-