From f73a8f06655512407d721856e2bb1260dade2a19 Mon Sep 17 00:00:00 2001 From: Eric Parsonage Date: Fri, 19 Nov 2010 06:38:15 +0000 Subject: [PATCH] use ocamlfind to find ocaml libs --- sw/tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/tools/Makefile b/sw/tools/Makefile index 4c9ab5b0e4..6cdf1dadfd 100644 --- a/sw/tools/Makefile +++ b/sw/tools/Makefile @@ -24,7 +24,7 @@ Q=@ OCAML=ocaml OCAMLC=ocamlc -INCLUDES=-I ../lib/ocaml -I +xml-light +INCLUDES=-I ../lib/ocaml $(shell ocamlfind query -r -i-format xml-light) OCAMLNETINCLUDES=$(shell ocamlfind query -r -i-format netstring) OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring) OCAMLLEX=ocamllex @@ -48,7 +48,7 @@ gen_flight_plan.cmo : fp_proc.cmi @echo OC $< $(Q)$(OCAMLC) $(INCLUDES) -o $@ unix.cma str.cma ivy-ocaml.cma xml-light.cma lib-pprz.cma $< @cat ../../pprz_src_test.sh > $@ - @echo '$(OCAML) -I +xml-light $(OCAMLNETINCLUDES) -I $$PAPARAZZI_SRC/sw/lib/ocaml unix.cma str.cma ivy-ocaml.cma xml-light.cma $(OCAMLNETCMA) lib-pprz.cma $$PAPARAZZI_BIN/$< $$*' >> $@ + @echo '$(OCAML) $(shell ocamlfind query -r -i-format xml-light) $(OCAMLNETINCLUDES) -I $$PAPARAZZI_SRC/sw/lib/ocaml unix.cma str.cma ivy-ocaml.cma xml-light.cma $(OCAMLNETCMA) lib-pprz.cma $$PAPARAZZI_BIN/$< $$*' >> $@ @chmod a+x $@ %.cmo : %.ml ../lib/ocaml/lib-pprz.cma