diff options
| author | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
|---|---|---|
| committer | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
| commit | e0f0f573a4a8fc1f564a31388afa9c23e48bb016 (patch) | |
| tree | b7c004b3aae01c79bef8c8914e759a1e3ce358f7 /Makefile.extr | |
| parent | 18fcf2ffef8b4ba5eb0624b15371e93b4ac88cfe (diff) | |
| parent | e2b4459ccd1b0f8436cb70a631772d715e642dcd (diff) | |
| download | compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.tar.gz compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.zip | |
fix merge conflicts
Diffstat (limited to 'Makefile.extr')
| -rw-r--r-- | Makefile.extr | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.extr b/Makefile.extr index 51dbd767..8fdc9ffe 100644 --- a/Makefile.extr +++ b/Makefile.extr @@ -63,7 +63,8 @@ MODORDER=tools/modorder .depend.extr PARSERS=backend/CMparser.mly cparser/pre_parser.mly LEXERS=backend/CMlexer.mll cparser/Lexer.mll \ - lib/Tokenize.mll lib/Readconfig.mll + lib/Tokenize.mll lib/Readconfig.mll \ + lib/Responsefile.mll LIBS=str.cmxa unix.cmxa $(MENHIR_LIBS) LIBS_BYTE=$(patsubst %.cmxa,%.cma,$(patsubst %.cmx,%.cmo,$(LIBS))) |