From 3475bed79c40cdf6430d936ea40759882054728d Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 5 Feb 2010 21:16:56 +0000 Subject: [PATCH] remove the last vestiges of support for "make build-profile" without first configuring the build-profile, simplifying the build process and closing bug 21 --- Makefile.am | 12 ------- Makefile.reconf_args | 78 -------------------------------------------- 2 files changed, 90 deletions(-) delete mode 100644 Makefile.reconf_args diff --git a/Makefile.am b/Makefile.am index bade9cd15..d7d994d24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,18 +5,6 @@ ACLOCAL_AMFLAGS = -I config SUBDIRS = src test doc contrib -@mk_include@ @top_srcdir@/Makefile.reconf_args - -.PHONY: production debug default competition -production debug default competition: - cd @top_srcdir@; \ - dir="builds/`config/config.guess`/`config/build-type $@ $(BTARGS)`"; \ - if test -e "$$dir"; then \ - cd "$$dir" && $(MAKE); \ - else \ - ./configure --with-build=$@ $(CONFARGS) && $(MAKE); \ - fi - .PHONY: regress0 regress1 regress2 regress3 regress0 regress1 regress2 regress3: (cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 diff --git a/Makefile.reconf_args b/Makefile.reconf_args deleted file mode 100644 index 516ae0adb..000000000 --- a/Makefile.reconf_args +++ /dev/null @@ -1,78 +0,0 @@ -# -*-makefile-*- -# This makefile snippet maps make-time arguments to configure and -# build-type arguments -# -# Morgan Deters 2009 for CVC4 -BTARGS = -CONFARGS = - -ifeq ($(OPTIMIZE),0) - BTARGS += noopt - CONFARGS += --disable-optimized -else -ifeq ($(OPTIMIZE),1) - BTARGS += opt - CONFARGS += --enable-optimized -endif -endif - -ifeq ($(DEBUG_SYMBOLS),0) - BTARGS += nodsy - CONFARGS += --disable-debug-symbols -else -ifeq ($(DEBUG_SYMBOLS),1) - BTARGS += dsy - CONFARGS += --enable-debug-symbols -endif -endif - -ifeq ($(ASSERTIONS),0) - BTARGS += noass - CONFARGS += --disable-assertions -else -ifeq ($(ASSERTIONS),1) - BTARGS += ass - CONFARGS += --enable-assertions -endif -endif - -ifeq ($(TRACING),0) - BTARGS += notrc - CONFARGS += --disable-tracing -else -ifeq ($(TRACING),1) - BTARGS += trc - CONFARGS += --enable-tracing -endif -endif - -ifeq ($(MUZZLE),0) - BTARGS += nomzl - CONFARGS += --disable-muzzle -else -ifeq ($(MUZZLE),1) - BTARGS += mzl - CONFARGS += --enable-muzzle -endif -endif - -ifeq ($(COVERAGE),0) - BTARGS += nocvg - CONFARGS += --disable-coverage -else -ifeq ($(COVERAGE),1) - BTARGS += cvg - CONFARGS += --enable-coverage -endif -endif - -ifeq ($(PROFILING),0) - BTARGS += noprf - CONFARGS += --disable-profiling -else -ifeq ($(PROFILING),1) - BTARGS += prf - CONFARGS += --enable-profiling -endif -endif - -- 2.30.2