Skip to content

Commit

Permalink
Correct the spelling of "type_conv"
Browse files Browse the repository at this point in the history
  • Loading branch information
David Scott committed Sep 15, 2012
1 parent bbd9b41 commit f66b0dd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/META
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ requires = "rpc-light.xml, rpc-light.json"

package "syntax" (
description = "rpc-light: library to marshalling/unmarshalling ML types to/from RPC intermediate language"
requires = "type-conv"
requires = "type_conv"
archive(syntax,preprocessor) = "pa_rpc.cma"
archive(syntax,toploop) = "pa_rpc.cma"
)
Expand Down
8 changes: 4 additions & 4 deletions lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OCAMLOPT = ocamlfind ocamlopt
OCAMLFLAGS = -annot -g
PACKS = xmlm

ICAMLP4 = -I $(shell ocamlfind query camlp4) -I $(shell ocamlfind query type-conv)
ICAMLP4 = -I $(shell ocamlfind query camlp4) -I $(shell ocamlfind query type_conv)
DOCDIR = /myrepos/xen-api-libs.hg/doc
TARGETS = \
rpc.cmi rpc.cmo rpc.o rpc.cmx \
Expand All @@ -25,13 +25,13 @@ idl.cma: p4_rpc.cmo p4_idl.cmo
$(OCAMLC) -a $(ICAMLP4) -o $@ $^

pa_rpc.cmo: pa_rpc.ml p4_rpc.cmo pa_module_conv.cmo
$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<

p4_rpc.cmo: p4_rpc.ml rpc.cmo
$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<

p4_idl.cmo: p4_idl.ml p4_rpc.cmo
$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
$(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<

%.o %.cmx: %.ml
$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS) -c -o $@ $<
Expand Down

0 comments on commit f66b0dd

Please sign in to comment.