Commit d6e15c72 authored by Kim Nguyễn's avatar Kim Nguyễn
Browse files

Fix some dependencies.

parent 092258f1
......@@ -204,7 +204,9 @@ parser/cduce_loc.cmo parser/cduce_url.cmo \
schema/schema_parser.cmo schema/schema_converter.cmo \
runtime/load_xml.cmo runtime/print_xml.cmo compile/operators.cmo types/builtin.cmo \
driver/librarian.cmo \
types/sample.cmo driver/cduce.cmo
types/sample.cmo driver/cduce.cmo \
runtime/system.cmo query/query_aggregates.cmo
schema/schema_types.ml: schema/schema_types.mli
cp $^ $@
......@@ -369,7 +371,34 @@ cduceeditor_js_runtime.js:
$(HIDE) js_of_ocaml --extern-fs -I . $(STDLIB_CDO:%=--file=%) \
+nat.js +weak.js +toplevel.js cduceeditor_js_runtime
.PHONY: compute_depend cduce_js_runtime.bytecode
.PHONY: compute_depend cduce_js_runtime.bytecode compute_deps
compute_deps: $(DEPEND_OCAMLDEP)
$(HIDE) if test -z "$(COMPUTE_DEPS)"; \
then \
echo "usage: make compute_deps COMPUT_DEPS=<file.ml>"; false; \
else \
DEPENDS=""; \
FOUND=""; \
compute_depends () { \
FOUND="$${FOUND} $$1"; \
DEPS=`ocamlfind ocamldep -native -one-line -package "$(PACKAGES)" $(INCLUDES_DEPEND) $(SYNTAX_PARSER) -ppopt pa_extend.cmo -ppopt q_MLast.cmo "$$1" | grep -v .cmo | sed -e "s/[^ ]*.cmi//g" | cut -f 2 -d ':'`; \
for d in $$DEPS; \
do \
ML=`dirname "$$d"`/`basename "$$d" .cmx`.ml; \
if test "$${FOUND#*$$ML}" != "$${FOUND}" ; \
then \
continue; \
else \
compute_depends "$$ML"; \
fi; \
done; \
DEPENDS="$$1 $${DEPENDS}"; \
}; \
compute_depends "$(COMPUTE_DEPS)" ; \
echo "$$DEPENDS"; \
fi
compute_depend: $(DEPEND_OCAMLDEP)
@echo "Computing dependencies ..."
......@@ -438,15 +467,15 @@ build_flags:
$(HIDE) printf "%s" '$(FORPACKOPT) $(SYNTAX_PARSER) $(INCLUDES) $(EXTRA_LINK_OPTS)' > build_flags
%.cmo: %.ml build_flags
@echo "Build $@"
@echo "Build $@ $^"
$(HIDE)$(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<
%.cmx: %.ml build_flags
@echo "Build $@"
@echo "Build $@ $^"
$(HIDE) $(CAMLOPT) $(FORPACKOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
%.cmi: %.mli
@echo "Build $@"
@echo "Build $@ $^"
$(HIDE) $(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<
include depend
......
......@@ -292,6 +292,16 @@ driver/cduce.cmx : runtime/value.cmx parser/ulexer.cmx types/types.cmx \
compile/lambda.cmx types/ident.cmx runtime/eval.cmx compile/compile.cmx \
parser/cduce_loc.cmx types/builtin_defs.cmx types/builtin.cmx \
compile/auto_pat.cmx types/atoms.cmx parser/ast.cmx driver/cduce.cmi
runtime/system.cmo : runtime/value.cmi types/types.cmi types/sequence.cmi \
compile/operators.cmi types/ident.cmo parser/cduce_loc.cmi \
types/builtin_defs.cmi types/builtin.cmi types/atoms.cmi
runtime/system.cmx : runtime/value.cmx types/types.cmx types/sequence.cmx \
compile/operators.cmx types/ident.cmx parser/cduce_loc.cmx \
types/builtin_defs.cmx types/builtin.cmx types/atoms.cmx
query/query_aggregates.cmo : runtime/value.cmi types/sequence.cmi \
compile/operators.cmi types/intervals.cmi types/builtin_defs.cmi
query/query_aggregates.cmx : runtime/value.cmx types/sequence.cmx \
compile/operators.cmx types/intervals.cmx types/builtin_defs.cmx
parser/cduce_curl.cmo : runtime/value.cmi parser/cduce_url.cmi \
driver/cduce_config.cmi
parser/cduce_curl.cmx : runtime/value.cmx parser/cduce_url.cmx \
......@@ -330,10 +340,12 @@ driver/cducetop_js_runtime.cmo : driver/librarian.cmi runtime/cduce_js.cmi \
driver/cduce_config.cmi driver/cduce.cmi
driver/cducetop_js_runtime.cmx : driver/librarian.cmx runtime/cduce_js.cmx \
driver/cduce_config.cmx driver/cduce.cmx
driver/cduceeditor_js_runtime.cmo : driver/librarian.cmi \
runtime/cduce_js.cmi driver/cduce_config.cmi driver/cduce.cmi
driver/cduceeditor_js_runtime.cmx : driver/librarian.cmx \
runtime/cduce_js.cmx driver/cduce_config.cmx driver/cduce.cmx
driver/cduceeditor_js_runtime.cmo : parser/ulexer.cmi driver/librarian.cmi \
types/ident.cmo parser/cduce_loc.cmi runtime/cduce_js.cmi \
driver/cduce_config.cmi driver/cduce.cmi
driver/cduceeditor_js_runtime.cmx : parser/ulexer.cmx driver/librarian.cmx \
types/ident.cmx parser/cduce_loc.cmx runtime/cduce_js.cmx \
driver/cduce_config.cmx driver/cduce.cmx
driver/start.cmo : driver/run.cmo
driver/start.cmx : driver/run.cmx
driver/examples.cmo :
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment