Patch from Khoo Yit Phang.

uRemove -I../AST from CFLAGS, and change all affected #include to use relative paths.

This is in preparation to fix up automatic dependencies generation to use "gcc -MG" to handle the generated
src/AST/ASTKind.h file, which works more reliably when #include uses relative paths.

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

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index a0115a86a5ceafab1ac825fe426d969099c9f420..351c854f609354341ebe5ec55e57f0490aa96b1d 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -75,7 +75,7 @@ ifeq ($(shell uname -s), DarwinX)
   CFLAGS = -isysroot $(UNIVERSAL_SDK) $(UNIVERSAL_ARCH) $(CFLAGS_BASE)
 else
   LDFLAGS = $(LDFLAGS_BASE)
-  CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32) $(CFLAGS_FPIC) -I../AST
+  CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32) $(CFLAGS_FPIC)
 endif
 
 # Used by Doug Lea's malloc that I added into minisat2.

diff --git a/src/AST/ASTNode.h b/src/AST/ASTNode.h
index 75d1b2270cb3c2adfff2df869642fd66e463522b..e83ce2d19578831aec17f874e757d4c4c7ccb641 100644 (file)
--- a/src/AST/ASTNode.h
+++ b/src/AST/ASTNode.h
@@ -8,7 +8,7 @@
  ********************************************************************/
 #ifndef ASTNODE_H
 #define ASTNODE_H
-#include "../AST/NodeFactory/HashingNodeFactory.h"
+#include "NodeFactory/HashingNodeFactory.h"
 
 /********************************************************************
  *  This file gives the class description of the ASTNode class      *

diff --git a/src/AST/NodeFactory/HashingNodeFactory.cpp b/src/AST/NodeFactory/HashingNodeFactory.cpp
index 57f0337f890f3d93dbf8c0ee91e6727225488ced..e584ac779305c2ec489570685aba444899c9abbb 100644 (file)
--- a/src/AST/NodeFactory/HashingNodeFactory.cpp
+++ b/src/AST/NodeFactory/HashingNodeFactory.cpp
@@ -1,6 +1,6 @@
 #include "HashingNodeFactory.h"
-#include "AST.h"
-#include "../STPManager/STP.h"
+#include "../AST.h"
+#include "../../STPManager/STP.h"
 
 using BEEV::Kind;
 using BEEV::ASTInterior;

diff --git a/src/AST/NodeFactory/HashingNodeFactory.h b/src/AST/NodeFactory/HashingNodeFactory.h
index ce1d92b2520a8f23ded98621f47376c22b6867bf..0d77fc22e02c187161af024e0f8711a5e1844186 100644 (file)
--- a/src/AST/NodeFactory/HashingNodeFactory.h
+++ b/src/AST/NodeFactory/HashingNodeFactory.h
@@ -3,7 +3,7 @@
 #define HASHINGNODEFACTORY_H_
 
 #include "NodeFactory.h"
-#include "ASTKind.h"
+#include "../ASTKind.h"
 namespace BEEV
 {
        class STPMgr;

diff --git a/src/AST/NodeFactory/NodeFactory.cpp b/src/AST/NodeFactory/NodeFactory.cpp
index 3e4b8053bb99583da6ce500b29bf1ece05484883..9930c7a6a4e3ebb19caba6d81fc1f026895aefa5 100644 (file)
--- a/src/AST/NodeFactory/NodeFactory.cpp
+++ b/src/AST/NodeFactory/NodeFactory.cpp
@@ -1,5 +1,5 @@
-#include "ASTKind.h"
-#include "AST.h"
+#include "../ASTKind.h"
+#include "../AST.h"
 #include "../../STPManager/STPManager.h"
 
 NodeFactory::~NodeFactory()

diff --git a/src/AST/NodeFactory/NodeFactory.h b/src/AST/NodeFactory/NodeFactory.h
index a32e3a060529307bdeb5d09d3d2085c298e4babb..49762665aa3377de3d2dbc33f2b3b515166b2500 100644 (file)
--- a/src/AST/NodeFactory/NodeFactory.h
+++ b/src/AST/NodeFactory/NodeFactory.h
@@ -3,7 +3,7 @@
 #define NODEFACTORY_H
 
 #include <vector>
-#include "ASTKind.h"
+#include "../ASTKind.h"
 
 namespace BEEV
 {

diff --git a/src/AST/NodeFactory/TypeChecker.h b/src/AST/NodeFactory/TypeChecker.h
index 840bf179355ea5055adb645b295d8af921688fa8..da5588dc74b5355d4a2a420361a6b7286f862ac6 100644 (file)
--- a/src/AST/NodeFactory/TypeChecker.h
+++ b/src/AST/NodeFactory/TypeChecker.h
@@ -6,7 +6,7 @@
 #define TYPECHECKER_H_
 
 #include "NodeFactory.h"
-#include "../STPManager/STPManager.h"
+#include "../../STPManager/STPManager.h"
 
 namespace BEEV
 {

diff --git a/src/printer/BenchPrinter.cpp b/src/printer/BenchPrinter.cpp
index 1c52f7f9c4be774e293ee13503db1a6c27532230..3f0424f3182fbff2a9f9ccaefb504afd209fce71 100644 (file)
--- a/src/printer/BenchPrinter.cpp
+++ b/src/printer/BenchPrinter.cpp
@@ -1,6 +1,6 @@
 #include "printers.h"
 #include <string>
-#include "ASTKind.h"
+#include "../AST/ASTKind.h"
 #include <deque>
 
 /*

diff --git a/src/to-sat/AIG/ToSATAIG.h b/src/to-sat/AIG/ToSATAIG.h
index 06380c8d6dabe626da52dcf88006d4863e57b99c..1d1fde2d718c2254c987107d48f858c3d862aa91 100644 (file)
--- a/src/to-sat/AIG/ToSATAIG.h
+++ b/src/to-sat/AIG/ToSATAIG.h
@@ -11,9 +11,9 @@
 #define TOSATAIG_H
 #include <cmath>
 
-#include "../AST/AST.h"
-#include "../AST/RunTimes.h"
-#include "../STPManager/STPManager.h"
+#include "../../AST/AST.h"
+#include "../../AST/RunTimes.h"
+#include "../../STPManager/STPManager.h"
 #include "../BitBlaster.h"
 #include "BBNodeManagerAIG.h"
 #include "ToCNFAIG.h"