[paparazzi-commits] [6419] use ocamlfind to find ocaml libs

[Eric]

Revision: 6419
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6419
Author:   lamestllama
Date:     2010-11-19 06:38:15 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
use ocamlfind to find ocaml libs

Modified Paths:
--------------
    paparazzi-software/trunk/sw/tools/Makefile

Modified: paparazzi-software/trunk/sw/tools/Makefile
===================================================================
--- paparazzi-software/trunk/sw/tools/Makefile  2010-11-19 06:32:44 UTC (rev 
6418)
+++ paparazzi-software/trunk/sw/tools/Makefile  2010-11-19 06:38:15 UTC (rev 
6419)
@@ -24,7 +24,7 @@
 
 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 @@
        @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