From 7dad017c9ce7b00a1aa3cc0b323297d8fe2cccf5 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 17 May 2015 14:44:28 +0200 Subject: [PATCH] abc/blifparse files reorganization --- Makefile | 2 +- frontends/blif/Makefile.inc | 3 +++ {passes/abc => frontends/blif}/blifparse.cc | 0 {passes/abc => frontends/blif}/blifparse.h | 0 passes/abc/Makefile.inc | 6 ------ passes/techmap/Makefile.inc | 4 ++++ passes/{abc => techmap}/abc.cc | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 frontends/blif/Makefile.inc rename {passes/abc => frontends/blif}/blifparse.cc (100%) rename {passes/abc => frontends/blif}/blifparse.h (100%) delete mode 100644 passes/abc/Makefile.inc rename passes/{abc => techmap}/abc.cc (99%) diff --git a/Makefile b/Makefile index 774ae616d..fc3329c8e 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 000000000..9729184eb --- /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 similarity index 100% rename from passes/abc/blifparse.cc rename to frontends/blif/blifparse.cc diff --git a/passes/abc/blifparse.h b/frontends/blif/blifparse.h similarity index 100% rename from passes/abc/blifparse.h rename to frontends/blif/blifparse.h diff --git a/passes/abc/Makefile.inc b/passes/abc/Makefile.inc deleted file mode 100644 index a7c5b02c6..000000000 --- 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 a3e429cec..6ef4fbc26 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 similarity index 99% rename from passes/abc/abc.cc rename to passes/techmap/abc.cc index 81cf2bd4c..2db9e259e 100644 --- a/passes/abc/abc.cc +++ b/passes/techmap/abc.cc @@ -56,7 +56,7 @@ # include #endif -#include "blifparse.h" +#include "frontends/blif/blifparse.h" USING_YOSYS_NAMESPACE PRIVATE_NAMESPACE_BEGIN -- 2.30.2