diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-10-20 17:55:24 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-10-20 17:55:24 +0200 |
| commit | 5111bce03766251ffde8cd3d29a315c3c7c64364 (patch) | |
| tree | f0192011c801663e531e42dbeb0f15bb4355fc87 /Makefile.extr | |
| parent | 5c408186f4f66d6955c9d2a682cec36231343f87 (diff) | |
| parent | dfa2941c7df7641872464ff07466f754718df1c1 (diff) | |
| download | compcert-kvx-5111bce03766251ffde8cd3d29a315c3c7c64364.tar.gz compcert-kvx-5111bce03766251ffde8cd3d29a315c3c7c64364.zip | |
Merge branch 'clean' of https://github.com/fpottier/CompCert into fpottier-clean
Conflicts:
Makefile.extr
Diffstat (limited to 'Makefile.extr')
| -rw-r--r-- | Makefile.extr | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.extr b/Makefile.extr index 77b6880e..68709ff5 100644 --- a/Makefile.extr +++ b/Makefile.extr @@ -17,6 +17,10 @@ include Makefile.config +# Menhir configuration and rules. + +include Makefile.menhir + # Directories containing plain Caml code DIRS=extraction \ @@ -47,7 +51,6 @@ OCAMLC=ocamlc$(DOTOPT) $(COMPFLAGS) OCAMLOPT=ocamlopt$(DOTOPT) $(COMPFLAGS) OCAMLDEP=ocamldep$(DOTOPT) -slash $(INCLUDES) -MENHIR=menhir --explain OCAMLLEX=ocamllex -q MODORDER=tools/modorder .depend.extr @@ -55,7 +58,9 @@ PARSERS=backend/CMparser.mly cparser/pre_parser.mly LEXERS=backend/CMlexer.mll cparser/Lexer.mll \ lib/Tokenize.mll lib/Readconfig.mll -LIBS=str.cmxa unix.cmxa +LIBS=str.cmxa unix.cmxa $(MENHIR_LIBS) +LIBS_BYTE=$(patsubst %.cmxa,%.cma,$(patsubst %.cmx,%.cmo,$(LIBS))) + CHECKLINK_LIBS=str.cmxa EXECUTABLES=ccomp ccomp.byte cchecklink cchecklink.byte clightgen clightgen.byte @@ -73,7 +78,7 @@ ccomp: $(CCOMP_OBJS) ccomp.byte: $(CCOMP_OBJS:.cmx=.cmo) @echo "Linking $@" - @$(OCAMLC) -o $@ $(LIBS:.cmxa=.cma) $+ + @$(OCAMLC) -o $@ $(LIBS_BYTE) $+ CLIGHTGEN_OBJS:=$(shell $(MODORDER) exportclight/Clightgen.cmx) @@ -83,7 +88,7 @@ clightgen: $(CLIGHTGEN_OBJS) clightgen.byte: $(CLIGHTGEN_OBJS:.cmx=.cmo) @echo "Linking $@" - @$(OCAMLC) -o $@ $(LIBS:.cmxa=.cma) $+ + @$(OCAMLC) -o $@ $(LIBS_BYTE) $+ include .depend.extr @@ -101,8 +106,6 @@ endif @echo "OCAMLOPT $<" @$(OCAMLOPT) -c $< -%.ml %.mli: %.mly - $(MENHIR) $< %.ml: %.mll $(OCAMLLEX) $< |