git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk...

diff --git a/INSTALL b/INSTALL
index 7f8f181235c309b18528e5e1ce2ad49ec6168b83..99626a370a2a9236334ae2e294bad352ac87117e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,23 @@
-1. To install STP perform the following steps on your Unix/GNU-Linux/MacOS X commandline:
+1. To install STP perform the following steps on your
+Unix/GNU-Linux/MacOS X commandline:
 
-./configure --with-prefix=$HOME (or another installation directory)
-make
-make install
+./clean-install.sh
 
-2. To test the system after installation, you will need to download the regression tests. The regression are 190MB big, so are stored separately. To download them, try something like:
+2. To test the system after installation, you will need to download
+the regression tests. The regression are 190MB big, so are stored
+separately. To download them, try something like:
 
-svn co https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/stp-tests/test
+svn co
+https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/stp-tests/test
 
-The directory of the regression tests is hard-coded in /bin/run_tests, which you may need to update, depending on where you checkout the regression tests to.
+The directory of the regression tests is hard-coded in /bin/run_tests,
+which you may need to update, depending on where you checkout the
+regression tests to.
 
 To run the regression tests: make regressall
 
-NB:
-* If you want to compile a statically linked version of STP, run ./liblinks.sh after the configure script, and then compile adding STATIC=true to the make commands.
+NB: 
+
+* If you want to compile a statically linked version of STP, run
+./liblinks.sh after the configure script, and then compile adding
+STATIC=true to the make commands.

diff --git a/clean-install b/clean-install.sh
similarity index 88%
rename from clean-install
rename to clean-install.sh
index bbb6746363404cd9e5ebdfcab4350c98f962907d..f9355da83674f41f3ee8da02d9287220410b51a8 100755 (executable)
--- a/clean-install
+++ b/clean-install.sh
@@ -17,8 +17,8 @@ while [ $# -gt 0 ]; do
 done
 
 
+./make-scripts/configure --with-prefix=$PREFIX
 make clean
-./configure --with-prefix=$PREFIX
 make
 make install
 

diff --git a/Makefile.common b/make-scripts/Makefile.common
similarity index 100%
rename from Makefile.common
rename to make-scripts/Makefile.common

diff --git a/make-scripts/Makefile.in b/make-scripts/Makefile.in
index 9be6b1d2ccc23d2a173c1ea868c24efab7b8ff8c..aa42bffeb51dbf5e88969ee4cdb69370ead2549e 100644 (file)
--- a/make-scripts/Makefile.in
+++ b/make-scripts/Makefile.in
@@ -4,7 +4,7 @@
  # To make in optimized mode, type 'make "OPTIMIZE=-O3" 
 
 
-include Makefile.common make-scripts/config.info
+include make-scripts/Makefile.common make-scripts/config.info
 
 BIN_DIR=$(PREFIX)/bin
 LIB_DIR=$(PREFIX)/lib

diff --git a/make-scripts/config.info b/make-scripts/config.info
index a67a7973a622f8c6ae7ff0be3e1cde45810ab21d..9613a5bfae6330f672438018140654dab358df3f 100644 (file)
--- a/make-scripts/config.info
+++ b/make-scripts/config.info
@@ -1 +1 @@
-PREFIX=/usr/local
+PREFIX=/afs/csail.mit.edu/u/v/vganesh

diff --git a/configure b/make-scripts/configure
similarity index 100%
rename from configure
rename to make-scripts/configure

diff --git a/format_config.xml b/make-scripts/format_config.xml
similarity index 100%
rename from format_config.xml
rename to make-scripts/format_config.xml

diff --git a/src/AST/Makefile b/src/AST/Makefile
index a91aa5061b6b20892264130ae68f74fa1688a1af..71b4879976b0c4766ac2f37d76b825bec0094792 100644 (file)
--- a/src/AST/Makefile
+++ b/src/AST/Makefile
@@ -1,4 +1,4 @@
-include ../../Makefile.common
+include ../../make-scripts/Makefile.common
 
 #SRCS = AST.cpp ASTKind.cpp  ASTUtil.cpp BitBlast.cpp SimpBool.cpp  ToCNF.cpp DPLLMgr.cpp ToSAT.cpp Transform.cpp
 SRCS = AST.cpp ASTKind.cpp  ASTUtil.cpp BitBlast.cpp SimpBool.cpp  ToCNF.cpp ToSAT.cpp Transform.cpp printer/SMTLIBPrinter.cpp  printer/dotPrinter.cpp  printer/CPrinter.cpp

diff --git a/src/bitvec/Makefile b/src/bitvec/Makefile
index ac885f50e1322b3117cff2f4a2bce7235ae9b27d..6f4c401ea775266f8452df9eca6310e4af9f4465 100644 (file)
--- a/src/bitvec/Makefile
+++ b/src/bitvec/Makefile
@@ -1,4 +1,4 @@
-include ../../Makefile.common
+include ../../make-scripts/Makefile.common
 
 SRCS = consteval.cpp
 OBJS = $(SRCS:.cpp=.o)

diff --git a/src/c_interface/Makefile b/src/c_interface/Makefile
index 11cca9180edc4e9d22a92e43194efc313ad86662..ab27595d25118c3e443b493ed45e697b89b5c15e 100644 (file)
--- a/src/c_interface/Makefile
+++ b/src/c_interface/Makefile
@@ -1,4 +1,4 @@
-include ../../Makefile.common
+include ../../make-scripts/Makefile.common
 
 SRCS = c_interface.cpp
 OBJS = $(SRCS:.cpp=.o)

diff --git a/src/constantbv/Makefile b/src/constantbv/Makefile
index 9ddcb7949e5610d11da89dc6c6e464abc47a3645..7d5ef9af44e871a5c4db32144a6f26746b2e4361 100644 (file)
--- a/src/constantbv/Makefile
+++ b/src/constantbv/Makefile
@@ -1,4 +1,4 @@
-include ../../Makefile.common
+include ../../make-scripts/Makefile.common
 
 SRCS = constantbv.cpp
 OBJS = $(SRCS:.cpp=.o)

diff --git a/ocaml-wrapper/COPYRIGHT-NOTICE b/src/ocaml-wrapper/COPYRIGHT-NOTICE
similarity index 100%
rename from ocaml-wrapper/COPYRIGHT-NOTICE
rename to src/ocaml-wrapper/COPYRIGHT-NOTICE

diff --git a/ocaml-wrapper/Makefile b/src/ocaml-wrapper/Makefile
similarity index 100%
rename from ocaml-wrapper/Makefile
rename to src/ocaml-wrapper/Makefile

diff --git a/ocaml-wrapper/OCamlMakefile b/src/ocaml-wrapper/OCamlMakefile
similarity index 100%
rename from ocaml-wrapper/OCamlMakefile
rename to src/ocaml-wrapper/OCamlMakefile

diff --git a/ocaml-wrapper/libstp.idl b/src/ocaml-wrapper/libstp.idl
similarity index 100%
rename from ocaml-wrapper/libstp.idl
rename to src/ocaml-wrapper/libstp.idl

diff --git a/ocaml-wrapper/libstp_regerrorhandler.c b/src/ocaml-wrapper/libstp_regerrorhandler.c
similarity index 100%
rename from ocaml-wrapper/libstp_regerrorhandler.c
rename to src/ocaml-wrapper/libstp_regerrorhandler.c

diff --git a/ocaml-wrapper/stpvc.ml b/src/ocaml-wrapper/stpvc.ml
similarity index 100%
rename from ocaml-wrapper/stpvc.ml
rename to src/ocaml-wrapper/stpvc.ml

diff --git a/ocaml-wrapper/stpvc.mli b/src/ocaml-wrapper/stpvc.mli
similarity index 100%
rename from ocaml-wrapper/stpvc.mli
rename to src/ocaml-wrapper/stpvc.mli

diff --git a/src/parser/Makefile b/src/parser/Makefile
index f803700c2c34ceb54a8c5cc0217190ced861adb4..82c88c7f94f57757e8b70cefaf291a96769948a6 100644 (file)
--- a/src/parser/Makefile
+++ b/src/parser/Makefile
@@ -1,4 +1,4 @@
-include ../../Makefile.common
+include ../../make-scripts/Makefile.common
 
 LEX=flex
 YACC=bison -d -y --debug -v

diff --git a/src/simplifier/Makefile b/src/simplifier/Makefile
index b5739960442c8e3a70a768833325bc2c747d3f91..030edc5c7aea96848fc07ee8aec42fa73ad5984b 100644 (file)
--- a/src/simplifier/Makefile
+++ b/src/simplifier/Makefile
@@ -1,4 +1,4 @@
-include ../../Makefile.common
+include ../../make-scripts/Makefile.common
 
 SRCS = simplifier.cpp bvsolver.cpp
 OBJS = $(SRCS:.cpp=.o)