diff options
| author | Jim Lawson <ucbjrl@berkeley.edu> | 2018-08-27 10:09:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 10:09:39 -0700 |
| commit | 604b5d4e2026ffcb726ed65e4edbc6dbcec5f64f (patch) | |
| tree | 024214903fdf08578b38478be42b820abc09140b /frontends/ilang | |
| parent | 2c0601eb6f2c5ed0d376ed880efda48a2aeeb9ef (diff) | |
| parent | ddc1761f1a443ea9560c67cfc126160ba7254a39 (diff) | |
| download | yosys-604b5d4e2026ffcb726ed65e4edbc6dbcec5f64f.tar.gz yosys-604b5d4e2026ffcb726ed65e4edbc6dbcec5f64f.tar.bz2 yosys-604b5d4e2026ffcb726ed65e4edbc6dbcec5f64f.zip | |
Merge pull request #3 from YosysHQ/master
merge with YosysHQ
Diffstat (limited to 'frontends/ilang')
| -rw-r--r-- | frontends/ilang/.gitignore | 2 | ||||
| -rw-r--r-- | frontends/ilang/Makefile.inc | 7 | ||||
| -rw-r--r-- | frontends/ilang/ilang_lexer.l | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/frontends/ilang/.gitignore b/frontends/ilang/.gitignore index 43106a814..f586b33c7 100644 --- a/frontends/ilang/.gitignore +++ b/frontends/ilang/.gitignore @@ -1,4 +1,4 @@ ilang_lexer.cc ilang_parser.output ilang_parser.tab.cc -ilang_parser.tab.h +ilang_parser.tab.hh diff --git a/frontends/ilang/Makefile.inc b/frontends/ilang/Makefile.inc index e2a476c93..6f1f0e8fc 100644 --- a/frontends/ilang/Makefile.inc +++ b/frontends/ilang/Makefile.inc @@ -1,15 +1,14 @@ GENFILES += frontends/ilang/ilang_parser.tab.cc -GENFILES += frontends/ilang/ilang_parser.tab.h +GENFILES += frontends/ilang/ilang_parser.tab.hh GENFILES += frontends/ilang/ilang_parser.output GENFILES += frontends/ilang/ilang_lexer.cc frontends/ilang/ilang_parser.tab.cc: frontends/ilang/ilang_parser.y $(Q) mkdir -p $(dir $@) - $(P) $(BISON) -d -r all -b frontends/ilang/ilang_parser $< - $(Q) mv frontends/ilang/ilang_parser.tab.c frontends/ilang/ilang_parser.tab.cc + $(P) $(BISON) -o $@ -d -r all -b frontends/ilang/ilang_parser $< -frontends/ilang/ilang_parser.tab.h: frontends/ilang/ilang_parser.tab.cc +frontends/ilang/ilang_parser.tab.hh: frontends/ilang/ilang_parser.tab.cc frontends/ilang/ilang_lexer.cc: frontends/ilang/ilang_lexer.l $(Q) mkdir -p $(dir $@) diff --git a/frontends/ilang/ilang_lexer.l b/frontends/ilang/ilang_lexer.l index 842388548..d8e01ae4d 100644 --- a/frontends/ilang/ilang_lexer.l +++ b/frontends/ilang/ilang_lexer.l @@ -30,7 +30,7 @@ #endif #include "frontends/ilang/ilang_frontend.h" -#include "ilang_parser.tab.h" +#include "ilang_parser.tab.hh" USING_YOSYS_NAMESPACE |