diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-08-13 09:52:06 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-08-13 09:52:06 +0200 |
| commit | 80910d13a610886f4430fbd991ada78b2e586ada (patch) | |
| tree | c582d1b1394600030c8bd88a8ec4a3b25178fa1f /frontends/verilog | |
| parent | c699d7c6145f978b1864c2be25d9f0607099a3e5 (diff) | |
| parent | 698357dd9a17365566f4db2662e9ce9fea7594c4 (diff) | |
| download | yosys-80910d13a610886f4430fbd991ada78b2e586ada.tar.gz yosys-80910d13a610886f4430fbd991ada78b2e586ada.tar.bz2 yosys-80910d13a610886f4430fbd991ada78b2e586ada.zip | |
Merge branch 'master' of github.com:cliffordwolf/yosys
Diffstat (limited to 'frontends/verilog')
| -rw-r--r-- | frontends/verilog/Makefile.inc | 6 | ||||
| -rw-r--r-- | frontends/verilog/verilog_lexer.l | 2 | ||||
| -rw-r--r-- | frontends/verilog/verilog_parser.y | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc index 92cbd0b87..a06c1d5ab 100644 --- a/frontends/verilog/Makefile.inc +++ b/frontends/verilog/Makefile.inc @@ -5,13 +5,15 @@ GENFILES += frontends/verilog/verilog_parser.output GENFILES += frontends/verilog/verilog_lexer.cc frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y - $(P) $(BISON) -d -r all -b frontends/verilog/verilog_parser frontends/verilog/verilog_parser.y + $(Q) mkdir -p $(dir $@) + $(P) $(BISON) -d -r all -b frontends/verilog/verilog_parser $< $(Q) mv frontends/verilog/verilog_parser.tab.c frontends/verilog/verilog_parser.tab.cc frontends/verilog/verilog_parser.tab.h: frontends/verilog/verilog_parser.tab.cc frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l - $(P) flex -o frontends/verilog/verilog_lexer.cc frontends/verilog/verilog_lexer.l + $(Q) mkdir -p $(dir $@) + $(P) flex -o frontends/verilog/verilog_lexer.cc $< OBJS += frontends/verilog/verilog_parser.tab.o OBJS += frontends/verilog/verilog_lexer.o diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l index 480391532..bd7837b3a 100644 --- a/frontends/verilog/verilog_lexer.l +++ b/frontends/verilog/verilog_lexer.l @@ -40,7 +40,7 @@ #endif #include "kernel/log.h" -#include "verilog_frontend.h" +#include "frontends/verilog/verilog_frontend.h" #include "frontends/ast/ast.h" #include "verilog_parser.tab.h" diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y index 0a6a6111e..708ac7627 100644 --- a/frontends/verilog/verilog_parser.y +++ b/frontends/verilog/verilog_parser.y @@ -36,7 +36,7 @@ %{ #include <list> #include <string.h> -#include "verilog_frontend.h" +#include "frontends/verilog/verilog_frontend.h" #include "kernel/log.h" USING_YOSYS_NAMESPACE |