summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2015-05-17 14:44:28 +0200
committerClifford Wolf <clifford@clifford.at>2015-05-17 14:44:28 +0200
commit7dad017c9ce7b00a1aa3cc0b323297d8fe2cccf5 (patch)
tree78ee2b0dee42b5d08b4cff8b8eedfe97fc7717ab
parent61512b6f4115fce5326b78914b675be278c6845f (diff)
abc/blifparse files reorganization
-rw-r--r--Makefile2
-rw-r--r--frontends/blif/Makefile.inc3
-rw-r--r--frontends/blif/blifparse.cc (renamed from passes/abc/blifparse.cc)0
-rw-r--r--frontends/blif/blifparse.h (renamed from passes/abc/blifparse.h)0
-rw-r--r--passes/abc/Makefile.inc6
-rw-r--r--passes/techmap/Makefile.inc4
-rw-r--r--passes/techmap/abc.cc (renamed from passes/abc/abc.cc)2
7 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 774ae616..fc3329c8 100644
--- a/Makefile
+++ b/Makefile
@@ -255,6 +255,7 @@ else
include frontends/verilog/Makefile.inc
include frontends/ilang/Makefile.inc
include frontends/ast/Makefile.inc
+include frontends/blif/Makefile.inc
OBJS += passes/hierarchy/hierarchy.o
OBJS += passes/cmds/select.o
@@ -267,7 +268,6 @@ OBJS += passes/cmds/plugin.o
include passes/proc/Makefile.inc
include passes/opt/Makefile.inc
include passes/techmap/Makefile.inc
-include passes/abc/Makefile.inc
include backends/verilog/Makefile.inc
include backends/ilang/Makefile.inc
diff --git a/frontends/blif/Makefile.inc b/frontends/blif/Makefile.inc
new file mode 100644
index 00000000..9729184e
--- /dev/null
+++ b/frontends/blif/Makefile.inc
@@ -0,0 +1,3 @@
+
+OBJS += frontends/blif/blifparse.o
+
diff --git a/passes/abc/blifparse.cc b/frontends/blif/blifparse.cc
index a69cfde1..a69cfde1 100644
--- a/passes/abc/blifparse.cc
+++ b/frontends/blif/blifparse.cc
diff --git a/passes/abc/blifparse.h b/frontends/blif/blifparse.h
index 31f5b2e5..31f5b2e5 100644
--- a/passes/abc/blifparse.h
+++ b/frontends/blif/blifparse.h
diff --git a/passes/abc/Makefile.inc b/passes/abc/Makefile.inc
deleted file mode 100644
index a7c5b02c..00000000
--- a/passes/abc/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-ifeq ($(ENABLE_ABC),1)
-OBJS += passes/abc/abc.o
-OBJS += passes/abc/blifparse.o
-endif
-
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index a3e429ce..6ef4fbc2 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -5,6 +5,10 @@ OBJS += passes/techmap/dfflibmap.o
OBJS += passes/techmap/maccmap.o
OBJS += passes/techmap/libparse.o
+ifeq ($(ENABLE_ABC),1)
+OBJS += passes/techmap/abc.o
+endif
+
ifneq ($(SMALL),1)
OBJS += passes/techmap/iopadmap.o
OBJS += passes/techmap/hilomap.o
diff --git a/passes/abc/abc.cc b/passes/techmap/abc.cc
index 81cf2bd4..2db9e259 100644
--- a/passes/abc/abc.cc
+++ b/passes/techmap/abc.cc
@@ -56,7 +56,7 @@
# include <dirent.h>
#endif
-#include "blifparse.h"
+#include "frontends/blif/blifparse.h"
USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN