Skip to content

Fix dependencies in compiler/ and fix parallel compilation. #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hnrgrgr merged 1 commit into from
Nov 12, 2013
Merged

Fix dependencies in compiler/ and fix parallel compilation. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions compiler/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ reserved.cmo : util.cmi
reserved.cmx : util.cmx
specialize.cmo : option.cmo flow.cmi code.cmi specialize.cmi
specialize.cmx : option.cmx flow.cmx code.cmx specialize.cmi
specialize_js.cmo : flow.cmi code.cmi specialize_js.cmi
specialize_js.cmx : flow.cmx code.cmx specialize_js.cmi
specialize_js.cmo : util.cmi flow.cmi code.cmi specialize_js.cmi
specialize_js.cmx : util.cmx flow.cmx code.cmx specialize_js.cmi
subst.cmo : util.cmi code.cmi subst.cmi
subst.cmx : util.cmx code.cmx subst.cmi
tailcall.cmo : util.cmi subst.cmi option.cmo code.cmi tailcall.cmi
Expand Down Expand Up @@ -135,11 +135,3 @@ subst.cmi : code.cmi
tailcall.cmi : code.cmi
util.cmi :
varPrinter.cmi : util.cmi
js_parser.cmo : parse_info.cmi js_token.cmi javascript.cmi js_parser.cmi
js_parser.cmx : parse_info.cmx js_token.cmx javascript.cmx js_parser.cmi
js_parser.cmi : js_token.cmi javascript.cmi
js_parser.ml js_parser.mli: javascript.cmi js_token.cmi parse_info.cmi
annot_parser.cmo : primitive.cmi annot_parser.cmi
annot_parser.cmx : primitive.cmx annot_parser.cmi
annot_parser.cmi : primitive.cmi
annot_parser.ml annot_parser.mli: primitive.cmi
19 changes: 6 additions & 13 deletions compiler/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,20 @@ compiler.cmxs: $(OBJS)
%.cmi: %.mli
ocamlfind ocamlc -package findlib,str -c $<

%.ml %.mli: %.mly
menhir --explain $<

%.ml: %.mly
menhir --infer --explain $<

js_parser.ml: js_parser.mly
js_parser.ml js_parser.mli: js_parser.mly
menhir --external-tokens Js_token --explain $<


%.ml: %.mll
%.ml %.mli: %.mll
ocamllex $<
clean:
rm -f *.cm[aiox] *.cmxa *.cmxs *.o *.a *.conflicts
rm -f js_of_ocaml compile.opt compile.byte minify.opt minify.byte

depend:
${MAKE} --no-print-directory js_lexer.ml
${MAKE} --no-print-directory annot_lexer.ml
.PHONY: depend
depend: js_lexer.ml annot_lexer.ml js_parser.ml annot_parser.ml
ocamldep *.ml *.mli > .depend
menhir --depend --external-tokens Js_token js_parser.mly >> .depend
menhir --depend annot_parser.mly >> .depend



include .depend