abc/blifparse files reorganization

2015-05-17 14:44:28 +02:00 · 2015-05-17 14:44:28 +02:00 · 7dad017c9c
parent 61512b6f41
commit 7dad017c9c
7 changed files with 9 additions and 8 deletions
--- a/2
+++ b/2
@ -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
--- a/frontends/blif/Makefile.inc
+++ b/frontends/blif/Makefile.inc
@ -0,0 +1,3 @@
+
+OBJS += frontends/blif/blifparse.o
+
--- a/frontends/blif/blifparse.cc
+++ b/frontends/blif/blifparse.cc
--- a/frontends/blif/blifparse.h
+++ b/frontends/blif/blifparse.h
--- a/passes/abc/Makefile.inc
+++ b/passes/abc/Makefile.inc
@ -1,6 +0,0 @@
-
-ifeq ($(ENABLE_ABC),1)
-OBJS += passes/abc/abc.o
-OBJS += passes/abc/blifparse.o
-endif
-
--- 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
--- a/passes/techmap/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