From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Mon, 11 Nov 2013 16:05:28 +0000 (-0500)
Subject: Some fixes to build system with dependency-tracking is off; should fix RPM/Debian... 
X-Git-Tag: cvc5-1.0.0~7266^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5df7d235ce1d57e9d78e66ee66ab0d3b53ca3fcd;p=cvc5.git

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

diff --git a/config/cvc4.m4 b/config/cvc4.m4
index 1b241feb4..27ac51521 100644
--- 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 8932af26d..a056c1d84 100644
--- 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 d856c7293..2ff857a2f 100755
--- 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 bcaef2b87..42582c67f 100644
--- 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
-