There was link error due to versionString.cpp. It has been fixed

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@211 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/clean-install.sh b/clean-install.sh
index 2b948c4ad5b9b17f4671ea444ff8a2b46d1676a9..8a19bf5106edb4714554fc5a86548d29210d182d 100755 (executable)
--- a/clean-install.sh
+++ b/clean-install.sh
@@ -19,5 +19,5 @@ done
 
 ./scripts/configure --with-prefix=$PREFIX
 make clean
-make install
+make
 

diff --git a/src/AST/Makefile b/src/AST/Makefile
index 579d4db37f87cff9e2471d55c36cf470d14d19a5..ba6331fcafa8f8095ec600950bc98730619b6c12 100644 (file)
--- a/src/AST/Makefile
+++ b/src/AST/Makefile
@@ -17,8 +17,8 @@ ASTKind.h ASTKind.cpp:        ASTKind.kinds genkinds.pl
 
 .PHONY: clean
 clean:
-       rm -rf *.o *~ bbtest asttest cnftest *.a  ASTKind.h ASTKind.cpp .#* depend
-       rm -rf printer/*.o
+       rm -rf *.o *~ bbtest asttest cnftest *.a  ASTKind.cpp .#* depend
+       rm -rf printer/*.o printer/*~
 
 depend: $(SRCS)
        @$(CXX) -MM $(CXXFLAGS) $(SRCS) > $@

diff --git a/src/main/Makefile b/src/main/Makefile
index 787828414ad272e79713c3deaac9e4f6e00b184f..d8e7979ba2e7d0474a3486c90e4bfb5a59ff651e 100644 (file)
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -1,28 +1,34 @@
 include ../../scripts/Makefile.common
 
-SRCS=versionString.cpp main.cpp Globals.cpp
+SRCS=main.cpp versionString.cpp Globals.cpp
 OBJS = $(SRCS:.cpp=.o)
 
-LIBS =         -L../to-sat -ltosat -L../AST -last -L../abstraction-refinement -labstractionrefinement \
+LIBS =         -L../to-sat -ltosat \
+       -L../AST -last \
+       -L../abstraction-refinement -labstractionrefinement \
        -L../sat -lminisat  \
        -L../simplifier -lsimplifier \
         -L../bitvec -lconsteval \
        -L../constantbv -lconstantbv \
        -L../parser -lparser
 
-#This rebuilds each time, because the target "parser" is not created
-#Until the dependencies on each of the libraries is included, that's safest.
+# This rebuilds each time, because the target "parser" is not created
+# Until the dependencies on each of the libraries is included, that's safest.
 parser:  $(OBJS) depend
        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o stp
        @mv stp ../../bin/stp
 
-.PHONY: clean
+#.PHONY: clean
 clean: 
        rm -rf *.o *~ *.a .#* depend versionString.cpp
 
-#Use svnversion to output the global revision number. This will be updated every time make is called. Because main.cpp depends on this, it will in turn be rebuilt every time.
+# Use svnversion to output the global revision number. 
+# This will be updated every time make is called. 
+# Because main.cpp depends on this, 
+# it will in turn be rebuilt every time.
 versionString.cpp: ALWAYS_RUN
-       @echo "#include <string> \n namespace BEEV{extern const std::string version=\"" $(shell svnversion ..) "\";}" > versionString.cpp
+       @echo "#include <string>"  > versionString.cpp
+       @echo "namespace BEEV{extern const std::string version=\"" $(shell svnversion ..) "\";}" >> versionString.cpp
 
 ALWAYS_RUN: