From 0a408cf7648b9b57f9b84ea1e7efa486eb0c2ceb Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Mon, 3 May 2010 21:31:55 +0000 Subject: [PATCH] theory detection fixes; fixes build breakage when you delete build directories --- src/expr/Makefile.am | 24 ++++++++++++------------ src/theory/Makefile.am | 4 ++-- src/theory/Makefile.subdirs | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index 404334199..ef51b9c83 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -49,58 +49,58 @@ EXTRA_DIST = \ include @top_srcdir@/src/theory/Makefile.subdirs -@srcdir@/kind.h: kind_template.h mkkind builtin_kinds @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/kind.h: kind_template.h mkkind builtin_kinds @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mkkind $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mkkind \ $< \ @srcdir@/builtin_kinds \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) -@srcdir@/metakind.h: metakind_template.h mkmetakind builtin_kinds @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/metakind.h: metakind_template.h mkmetakind builtin_kinds @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mkmetakind $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mkmetakind \ $< \ @srcdir@/builtin_kinds \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) -@srcdir@/expr.h: expr_template.h mkexpr builtin_kinds @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/expr.h: expr_template.h mkexpr builtin_kinds @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mkexpr $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mkexpr \ $< \ @srcdir@/builtin_kinds \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) -@srcdir@/expr.cpp: expr_template.cpp mkexpr builtin_kinds @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/expr.cpp: expr_template.cpp mkexpr builtin_kinds @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mkexpr $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mkexpr \ $< \ @srcdir@/builtin_kinds \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) -@srcdir@/expr_manager.h: expr_manager_template.h mkexpr builtin_kinds @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/expr_manager.h: expr_manager_template.h mkexpr builtin_kinds @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mkexpr $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mkexpr \ $< \ @srcdir@/builtin_kinds \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) -@srcdir@/expr_manager.cpp: expr_manager_template.cpp mkexpr builtin_kinds @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/expr_manager.cpp: expr_manager_template.cpp mkexpr builtin_kinds @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mkexpr $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mkexpr \ $< \ @srcdir@/builtin_kinds \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) BUILT_SOURCES = \ diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am index 07896271a..c2c356fde 100644 --- a/src/theory/Makefile.am +++ b/src/theory/Makefile.am @@ -25,12 +25,12 @@ EXTRA_DIST = \ include @top_srcdir@/src/theory/Makefile.subdirs -@srcdir@/theoryof_table.h: theoryof_table_template.h mktheoryof @top_srcdir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds +@srcdir@/theoryof_table.h: theoryof_table_template.h mktheoryof @top_builddir@/src/theory/.subdirs @top_srcdir@/src/theory/*/kinds $(AM_V_at)chmod +x @srcdir@/mktheoryof $(AM_V_at)$(am__mv) $@ $@~ 2>/dev/null || true $(AM_V_GEN)(@srcdir@/mktheoryof \ $< \ - `cat @top_srcdir@/src/theory/.subdirs` \ + `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) BUILT_SOURCES = @srcdir@/theoryof_table.h diff --git a/src/theory/Makefile.subdirs b/src/theory/Makefile.subdirs index bcc7db1c5..0dfba2449 100644 --- a/src/theory/Makefile.subdirs +++ b/src/theory/Makefile.subdirs @@ -1,6 +1,6 @@ -$(top_srcdir)/src/theory/.subdirs: $(top_srcdir)/src/theory/Makefile.am - $(AM_V_at)grep '^SUBDIRS = ' $(top_srcdir)/src/theory/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -i__D__ echo $(top_srcdir)/src/theory/__D__/kinds >$(top_srcdir)/src/theory/.subdirs.tmp - @if ! diff -q $(top_srcdir)/src/theory/.subdirs $(top_srcdir)/src/theory/.subdirs.tmp &>/dev/null; then \ +$(top_builddir)/src/theory/.subdirs: $(top_srcdir)/src/theory/Makefile.am + $(AM_V_at)grep '^SUBDIRS = ' $(top_srcdir)/src/theory/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -i__D__ echo $(top_srcdir)/src/theory/__D__/kinds >$(top_builddir)/src/theory/.subdirs.tmp + @if ! diff -q $(top_builddir)/src/theory/.subdirs $(top_builddir)/src/theory/.subdirs.tmp &>/dev/null; then \ echo " GEN " $@; \ - $(am__mv) $(top_srcdir)/src/theory/.subdirs.tmp $(top_srcdir)/src/theory/.subdirs; \ + $(am__mv) $(top_builddir)/src/theory/.subdirs.tmp $(top_builddir)/src/theory/.subdirs; \ fi -- 2.30.2