Changes to be able to compile ABC without CUDD.

54 files changed, 39 insertions, 37 deletions

diff --git a/src/proof/bbr/bbr.h b/src/bdd/bbr/bbr.h
index 1db638e8..1db638e8 100644
--- a/src/proof/bbr/bbr.h
+++ b/src/bdd/bbr/bbr.h
diff --git a/src/proof/bbr/bbrCex.c b/src/bdd/bbr/bbrCex.c
index 31a46d61..31a46d61 100644
--- a/src/proof/bbr/bbrCex.c
+++ b/src/bdd/bbr/bbrCex.c
diff --git a/src/proof/bbr/bbrImage.c b/src/bdd/bbr/bbrImage.c
index 1ff3d0b6..1ff3d0b6 100644
--- a/src/proof/bbr/bbrImage.c
+++ b/src/bdd/bbr/bbrImage.c
diff --git a/src/proof/bbr/bbrNtbdd.c b/src/bdd/bbr/bbrNtbdd.c
index f61c3d73..f61c3d73 100644
--- a/src/proof/bbr/bbrNtbdd.c
+++ b/src/bdd/bbr/bbrNtbdd.c
diff --git a/src/proof/bbr/bbrReach.c b/src/bdd/bbr/bbrReach.c
index b5125ec7..b5125ec7 100644
--- a/src/proof/bbr/bbrReach.c
+++ b/src/bdd/bbr/bbrReach.c
diff --git a/src/proof/bbr/bbr_.c b/src/bdd/bbr/bbr_.c
index df934f7d..df934f7d 100644
--- a/src/proof/bbr/bbr_.c
+++ b/src/bdd/bbr/bbr_.c
diff --git a/src/bdd/bbr/module.make b/src/bdd/bbr/module.make
new file mode 100644
index 00000000..4bb1a292
--- /dev/null
+++ b/src/bdd/bbr/module.make
@@ -0,0 +1,4 @@
+SRC +=    src/bdd/bbr/bbrCex.c \
+    src/bdd/bbr/bbrImage.c \
+    src/bdd/bbr/bbrNtbdd.c \
+    src/bdd/bbr/bbrReach.c
diff --git a/src/misc/extra/extraBdd.h b/src/bdd/extrab/extraBdd.h
index 3dbc6264..3dbc6264 100644
--- a/src/misc/extra/extraBdd.h
+++ b/src/bdd/extrab/extraBdd.h
diff --git a/src/misc/extra/extraBddAuto.c b/src/bdd/extrab/extraBddAuto.c
index 5fb38aec..5fb38aec 100644
--- a/src/misc/extra/extraBddAuto.c
+++ b/src/bdd/extrab/extraBddAuto.c
diff --git a/src/misc/extra/extraBddCas.c b/src/bdd/extrab/extraBddCas.c
index 024e4462..024e4462 100644
--- a/src/misc/extra/extraBddCas.c
+++ b/src/bdd/extrab/extraBddCas.c
diff --git a/src/misc/extra/extraBddImage.c b/src/bdd/extrab/extraBddImage.c
index 46afb4f2..46afb4f2 100644
--- a/src/misc/extra/extraBddImage.c
+++ b/src/bdd/extrab/extraBddImage.c
diff --git a/src/misc/extra/extraBddKmap.c b/src/bdd/extrab/extraBddKmap.c
index aa5efe75..aa5efe75 100644
--- a/src/misc/extra/extraBddKmap.c
+++ b/src/bdd/extrab/extraBddKmap.c
diff --git a/src/misc/extra/extraBddMisc.c b/src/bdd/extrab/extraBddMisc.c
index a2ba4036..a2ba4036 100644
--- a/src/misc/extra/extraBddMisc.c
+++ b/src/bdd/extrab/extraBddMisc.c
diff --git a/src/misc/extra/extraBddSymm.c b/src/bdd/extrab/extraBddSymm.c
index 9dd2c8e5..9dd2c8e5 100644
--- a/src/misc/extra/extraBddSymm.c
+++ b/src/bdd/extrab/extraBddSymm.c
diff --git a/src/misc/extra/extraBddTime.c b/src/bdd/extrab/extraBddTime.c
index dc9ff147..dc9ff147 100644
--- a/src/misc/extra/extraBddTime.c
+++ b/src/bdd/extrab/extraBddTime.c
diff --git a/src/misc/extra/extraBddUnate.c b/src/bdd/extrab/extraBddUnate.c
index 9ebdd4e5..9ebdd4e5 100644
--- a/src/misc/extra/extraBddUnate.c
+++ b/src/bdd/extrab/extraBddUnate.c
diff --git a/src/bdd/extrab/module.make b/src/bdd/extrab/module.make
new file mode 100644
index 00000000..38cdddb6
--- /dev/null
+++ b/src/bdd/extrab/module.make
@@ -0,0 +1,8 @@
+SRC +=    src/bdd/extrab/extraBddAuto.c \
+    src/bdd/extrab/extraBddCas.c \
+    src/bdd/extrab/extraBddImage.c \
+    src/bdd/extrab/extraBddKmap.c \
+    src/bdd/extrab/extraBddMisc.c \
+    src/bdd/extrab/extraBddSymm.c \
+    src/bdd/extrab/extraBddTime.c \
+    src/bdd/extrab/extraBddUnate.c
diff --git a/src/proof/llb/llb.c b/src/bdd/llb/llb.c
index 348c0622..348c0622 100644
--- a/src/proof/llb/llb.c
+++ b/src/bdd/llb/llb.c
diff --git a/src/proof/llb/llb.h b/src/bdd/llb/llb.h
index f465359d..f465359d 100644
--- a/src/proof/llb/llb.h
+++ b/src/bdd/llb/llb.h
diff --git a/src/proof/llb/llb1Cluster.c b/src/bdd/llb/llb1Cluster.c
index 1356e484..1356e484 100644
--- a/src/proof/llb/llb1Cluster.c
+++ b/src/bdd/llb/llb1Cluster.c
diff --git a/src/proof/llb/llb1Constr.c b/src/bdd/llb/llb1Constr.c
index 1ef4ce14..1ef4ce14 100644
--- a/src/proof/llb/llb1Constr.c
+++ b/src/bdd/llb/llb1Constr.c
diff --git a/src/proof/llb/llb1Core.c b/src/bdd/llb/llb1Core.c
index 213f2cd9..213f2cd9 100644
--- a/src/proof/llb/llb1Core.c
+++ b/src/bdd/llb/llb1Core.c
diff --git a/src/proof/llb/llb1Group.c b/src/bdd/llb/llb1Group.c
index 1099b2cd..1099b2cd 100644
--- a/src/proof/llb/llb1Group.c
+++ b/src/bdd/llb/llb1Group.c
diff --git a/src/proof/llb/llb1Hint.c b/src/bdd/llb/llb1Hint.c
index 353b4c69..353b4c69 100644
--- a/src/proof/llb/llb1Hint.c
+++ b/src/bdd/llb/llb1Hint.c
diff --git a/src/proof/llb/llb1Man.c b/src/bdd/llb/llb1Man.c
index f5de25e0..f5de25e0 100644
--- a/src/proof/llb/llb1Man.c
+++ b/src/bdd/llb/llb1Man.c
diff --git a/src/proof/llb/llb1Matrix.c b/src/bdd/llb/llb1Matrix.c
index 7aa9c744..7aa9c744 100644
--- a/src/proof/llb/llb1Matrix.c
+++ b/src/bdd/llb/llb1Matrix.c
diff --git a/src/proof/llb/llb1Pivot.c b/src/bdd/llb/llb1Pivot.c
index 7a5bb66f..7a5bb66f 100644
--- a/src/proof/llb/llb1Pivot.c
+++ b/src/bdd/llb/llb1Pivot.c
diff --git a/src/proof/llb/llb1Reach.c b/src/bdd/llb/llb1Reach.c
index fae7bee2..fae7bee2 100644
--- a/src/proof/llb/llb1Reach.c
+++ b/src/bdd/llb/llb1Reach.c
diff --git a/src/proof/llb/llb1Sched.c b/src/bdd/llb/llb1Sched.c
index 51de973a..51de973a 100644
--- a/src/proof/llb/llb1Sched.c
+++ b/src/bdd/llb/llb1Sched.c
diff --git a/src/proof/llb/llb2Bad.c b/src/bdd/llb/llb2Bad.c
index ac04b563..ac04b563 100644
--- a/src/proof/llb/llb2Bad.c
+++ b/src/bdd/llb/llb2Bad.c
diff --git a/src/proof/llb/llb2Core.c b/src/bdd/llb/llb2Core.c
index 3d62b322..3d62b322 100644
--- a/src/proof/llb/llb2Core.c
+++ b/src/bdd/llb/llb2Core.c
diff --git a/src/proof/llb/llb2Driver.c b/src/bdd/llb/llb2Driver.c
index 1471f377..1471f377 100644
--- a/src/proof/llb/llb2Driver.c
+++ b/src/bdd/llb/llb2Driver.c
diff --git a/src/proof/llb/llb2Dump.c b/src/bdd/llb/llb2Dump.c
index 74f07922..74f07922 100644
--- a/src/proof/llb/llb2Dump.c
+++ b/src/bdd/llb/llb2Dump.c
diff --git a/src/proof/llb/llb2Flow.c b/src/bdd/llb/llb2Flow.c
index 64db32b3..64db32b3 100644
--- a/src/proof/llb/llb2Flow.c
+++ b/src/bdd/llb/llb2Flow.c
diff --git a/src/proof/llb/llb2Image.c b/src/bdd/llb/llb2Image.c
index e245ba36..e245ba36 100644
--- a/src/proof/llb/llb2Image.c
+++ b/src/bdd/llb/llb2Image.c
diff --git a/src/proof/llb/llb3Image.c b/src/bdd/llb/llb3Image.c
index 72c6120a..72c6120a 100644
--- a/src/proof/llb/llb3Image.c
+++ b/src/bdd/llb/llb3Image.c
diff --git a/src/proof/llb/llb3Nonlin.c b/src/bdd/llb/llb3Nonlin.c
index 94a48bbf..94a48bbf 100644
--- a/src/proof/llb/llb3Nonlin.c
+++ b/src/bdd/llb/llb3Nonlin.c
diff --git a/src/proof/llb/llb4Cex.c b/src/bdd/llb/llb4Cex.c
index 18aeaf04..18aeaf04 100644
--- a/src/proof/llb/llb4Cex.c
+++ b/src/bdd/llb/llb4Cex.c
diff --git a/src/proof/llb/llb4Cluster.c b/src/bdd/llb/llb4Cluster.c
index 7e325597..7e325597 100644
--- a/src/proof/llb/llb4Cluster.c
+++ b/src/bdd/llb/llb4Cluster.c
diff --git a/src/proof/llb/llb4Image.c b/src/bdd/llb/llb4Image.c
index 2ba4fcfd..2ba4fcfd 100644
--- a/src/proof/llb/llb4Image.c
+++ b/src/bdd/llb/llb4Image.c
diff --git a/src/proof/llb/llb4Map.c b/src/bdd/llb/llb4Map.c
index 4487ce25..4487ce25 100644
--- a/src/proof/llb/llb4Map.c
+++ b/src/bdd/llb/llb4Map.c
diff --git a/src/proof/llb/llb4Nonlin.c b/src/bdd/llb/llb4Nonlin.c
index a9421358..a9421358 100644
--- a/src/proof/llb/llb4Nonlin.c
+++ b/src/bdd/llb/llb4Nonlin.c
diff --git a/src/proof/llb/llb4Sweep.c b/src/bdd/llb/llb4Sweep.c
index 6b318572..6b318572 100644
--- a/src/proof/llb/llb4Sweep.c
+++ b/src/bdd/llb/llb4Sweep.c
diff --git a/src/proof/llb/llbInt.h b/src/bdd/llb/llbInt.h
index e2afe59a..238da04e 100644
--- a/src/proof/llb/llbInt.h
+++ b/src/bdd/llb/llbInt.h
@@ -32,7 +32,7 @@
 #include "proof/ssw/ssw.h"
 #include "llb.h"
 
-#include "misc/extra/extraBdd.h"
+#include "bdd/extrab/extraBdd.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/bdd/llb/module.make b/src/bdd/llb/module.make
new file mode 100644
index 00000000..6d253d50
--- /dev/null
+++ b/src/bdd/llb/module.make
@@ -0,0 +1,22 @@
+SRC +=    src/bdd/llb/llb1Cluster.c \
+    src/bdd/llb/llb1Constr.c \
+    src/bdd/llb/llb1Core.c \
+    src/bdd/llb/llb1Group.c \
+    src/bdd/llb/llb1Hint.c \
+    src/bdd/llb/llb1Man.c \
+    src/bdd/llb/llb1Matrix.c \
+    src/bdd/llb/llb1Pivot.c \
+    src/bdd/llb/llb1Reach.c \
+    src/bdd/llb/llb1Sched.c \
+    src/bdd/llb/llb2Bad.c \
+    src/bdd/llb/llb2Core.c \
+    src/bdd/llb/llb2Driver.c \
+    src/bdd/llb/llb2Dump.c \
+    src/bdd/llb/llb2Flow.c \
+    src/bdd/llb/llb2Image.c \
+    src/bdd/llb/llb3Image.c \
+    src/bdd/llb/llb3Nonlin.c \
+    src/bdd/llb/llb4Cex.c \
+    src/bdd/llb/llb4Image.c \
+    src/bdd/llb/llb4Nonlin.c \
+    src/bdd/llb/llb4Sweep.c
diff --git a/src/bdd/parse/module.make b/src/bdd/parse/module.make
deleted file mode 100644
index 4f590f01..00000000
--- a/src/bdd/parse/module.make
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC +=  src/bdd/parse/parseCore.c \
-    src/bdd/parse/parseEqn.c \
-    src/bdd/parse/parseStack.c
diff --git a/src/misc/parse/module.make b/src/misc/parse/module.make
new file mode 100644
index 00000000..bb13c8e5
--- /dev/null
+++ b/src/misc/parse/module.make
@@ -0,0 +1,2 @@
+SRC +=  src/misc/parse/parseEqn.c \
+    src/misc/parse/parseStack.c
diff --git a/src/bdd/parse/parse.h b/src/misc/parse/parse.h
index 584ec30a..584ec30a 100644
--- a/src/bdd/parse/parse.h
+++ b/src/misc/parse/parse.h
diff --git a/src/bdd/parse/parseCore.c b/src/misc/parse/parseCore.c
index f451d3aa..f451d3aa 100644
--- a/src/bdd/parse/parseCore.c
+++ b/src/misc/parse/parseCore.c
diff --git a/src/bdd/parse/parseEqn.c b/src/misc/parse/parseEqn.c
index ac32e528..eef95dc2 100644
--- a/src/bdd/parse/parseEqn.c
+++ b/src/misc/parse/parseEqn.c
@@ -16,14 +16,11 @@
 
 ***********************************************************************/
 
-
 ////////////////////////////////////////////////////////////////////////
 ///                        DECLARATIONS                              ///
 ////////////////////////////////////////////////////////////////////////
 
 #include "parseInt.h"
-#include "misc/vec/vec.h"
-#include "aig/hop/hop.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/bdd/parse/parseInt.h b/src/misc/parse/parseInt.h
index 80ed945a..42a9805b 100644
--- a/src/bdd/parse/parseInt.h
+++ b/src/misc/parse/parseInt.h
@@ -24,10 +24,8 @@
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-
-#include <stdio.h>
-#include "misc/extra/extraBdd.h"
-#include "parse.h"
+#include "aig/hop/hop.h"
+#include "misc/vec/vec.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/bdd/parse/parseStack.c b/src/misc/parse/parseStack.c
index 2e6d266d..2e6d266d 100644
--- a/src/bdd/parse/parseStack.c
+++ b/src/misc/parse/parseStack.c
diff --git a/src/proof/bbr/module.make b/src/proof/bbr/module.make
deleted file mode 100644
index 11ba768e..00000000
--- a/src/proof/bbr/module.make
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC +=    src/proof/bbr/bbrCex.c \
-    src/proof/bbr/bbrImage.c \
-    src/proof/bbr/bbrNtbdd.c \
-    src/proof/bbr/bbrReach.c
diff --git a/src/proof/llb/module.make b/src/proof/llb/module.make
deleted file mode 100644
index b08c42af..00000000
--- a/src/proof/llb/module.make
+++ /dev/null
@@ -1,22 +0,0 @@
-SRC +=    src/proof/llb/llb1Cluster.c \
-    src/proof/llb/llb1Constr.c \
-    src/proof/llb/llb1Core.c \
-    src/proof/llb/llb1Group.c \
-    src/proof/llb/llb1Hint.c \
-    src/proof/llb/llb1Man.c \
-    src/proof/llb/llb1Matrix.c \
-    src/proof/llb/llb1Pivot.c \
-    src/proof/llb/llb1Reach.c \
-    src/proof/llb/llb1Sched.c \
-    src/proof/llb/llb2Bad.c \
-    src/proof/llb/llb2Core.c \
-    src/proof/llb/llb2Driver.c \
-    src/proof/llb/llb2Dump.c \
-    src/proof/llb/llb2Flow.c \
-    src/proof/llb/llb2Image.c \
-    src/proof/llb/llb3Image.c \
-    src/proof/llb/llb3Nonlin.c \
-    src/proof/llb/llb4Cex.c \
-    src/proof/llb/llb4Image.c \
-    src/proof/llb/llb4Nonlin.c \
-    src/proof/llb/llb4Sweep.c