Adding nodefactory classes to libstp so that libast doesn't need to be explicitly...

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

diff --git a/Makefile b/Makefile
index dac312054d6553476e4f26b6b8fbc077f8b85a66..596184da37dc26890deed28df6f7ff695d4d5842 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ endif
        $(MAKE) -C $(SRC)/parser
        $(MAKE) -C $(SRC)/main
        $(AR) rc libstp.a  $(SRC)/AST/*.o \
+                          $(SRC)/AST/NodeFactory/*.o \
                           $(SRC)/STPManager/*.o \
                           $(SRC)/printer/*.o \
                           $(SRC)/absrefine_counterexample/*.o \

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index dac312054d6553476e4f26b6b8fbc077f8b85a66..596184da37dc26890deed28df6f7ff695d4d5842 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -36,6 +36,7 @@ endif
        $(MAKE) -C $(SRC)/parser
        $(MAKE) -C $(SRC)/main
        $(AR) rc libstp.a  $(SRC)/AST/*.o \
+                          $(SRC)/AST/NodeFactory/*.o \
                           $(SRC)/STPManager/*.o \
                           $(SRC)/printer/*.o \
                           $(SRC)/absrefine_counterexample/*.o \

diff --git a/tests/c-api-tests/Makefile b/tests/c-api-tests/Makefile
index 100dedc35f2d6a71236afaa96d83e6d61832f503..3a3978424ae3ffc89dfb3b4d911ffcd45d41167f 100644 (file)
--- a/tests/c-api-tests/Makefile
+++ b/tests/c-api-tests/Makefile
@@ -1,8 +1,8 @@
 # Tests that run under valgrind will return a non-zero error code on
 # either leak, or use of unitialised values.
 include ../../scripts/Makefile.common
-CXXFLAGS= -DEXT_HASH_MAP $(CFLAGS) -I../../src/c_interface -L../../lib -L../../src/AST
-LIBS= -lstp -last
+CXXFLAGS= -DEXT_HASH_MAP $(CFLAGS) -I../../src/c_interface -L../../lib 
+LIBS= -lstp 
 
 VALGRINDPATH=`which valgrind`
 ifeq   "$(VALGRINDPATH)" ""