From 2ea06775c21e4d6ab9b041a48672189b09c0f1ff Mon Sep 17 00:00:00 2001
From: trevor_hansen <trevor_hansen@e59a4935-1847-0410-ae03-e826735625c1>
Date: Tue, 8 Feb 2011 11:51:42 +0000
Subject: [PATCH] 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
---
 scripts/Makefile.common                    | 2 +-
 src/AST/ASTNode.h                          | 2 +-
 src/AST/NodeFactory/HashingNodeFactory.cpp | 4 ++--
 src/AST/NodeFactory/HashingNodeFactory.h   | 2 +-
 src/AST/NodeFactory/NodeFactory.cpp        | 4 ++--
 src/AST/NodeFactory/NodeFactory.h          | 2 +-
 src/AST/NodeFactory/TypeChecker.h          | 2 +-
 src/printer/BenchPrinter.cpp               | 2 +-
 src/to-sat/AIG/ToSATAIG.h                  | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index a0115a8..351c854 100644
--- 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 75d1b22..e83ce2d 100644
--- 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 57f0337..e584ac7 100644
--- 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 ce1d92b..0d77fc2 100644
--- 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 3e4b805..9930c7a 100644
--- 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 a32e3a0..4976266 100644
--- 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 840bf17..da5588d 100644
--- 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 1c52f7f..3f0424f 100644
--- 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 06380c8..1d1fde2 100644
--- 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"
-- 
2.47.3