diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile index f6002fdf5c..6d38c2e30e 100644 --- a/sw/ground_segment/cockpit/Makefile +++ b/sw/ground_segment/cockpit/Makefile @@ -23,8 +23,8 @@ # Quiet compilation Q=@ -OCAMLC=ocamlc -thread -OCAMLOPT=ocamlopt -thread +OCAMLC=ocamlc -thread -I +xml-light +OCAMLOPT=ocamlopt -thread -I +xml-light INCLUDES=-I +lablgtk2 -I ../../lib/ocaml LIBS=glibivy-ocaml.cma lablgtk.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma CMXA=$(LIBS:.cma=.cmxa) diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile index 10c41b1800..21c0d52999 100644 --- a/sw/ground_segment/tmtc/Makefile +++ b/sw/ground_segment/tmtc/Makefile @@ -35,7 +35,7 @@ clean: OCAMLC = ocamlc OCAMLOPT = ocamlopt OCAMLLIB = ../../lib/ocaml -INCLUDES= -I $(OCAMLLIB) -I ../multimon -I +lablgtk2 +INCLUDES= -I $(OCAMLLIB) -I ../multimon -I +lablgtk2 -I +xml-light LIBPPRZCMA=$(OCAMLLIB)/lib-pprz.cma $(VAR)/boa.conf :$(CONF)/boa.conf diff --git a/sw/ground_segment/visu3d/Makefile b/sw/ground_segment/visu3d/Makefile index 2ee0d537c4..4bf6b5a338 100644 --- a/sw/ground_segment/visu3d/Makefile +++ b/sw/ground_segment/visu3d/Makefile @@ -1,5 +1,5 @@ OCAMLOPT0 = ocamlopt -OCAMLC = ocamlc +OCAMLC = ocamlc -I +xml-light MLFLAGS = -I +lablgtk2 -I +lablGL -I +camlimages -I ../../lib/ocaml diff --git a/sw/ground_segment/wind/Makefile b/sw/ground_segment/wind/Makefile index 8882401f33..d8c3cdf3a8 100644 --- a/sw/ground_segment/wind/Makefile +++ b/sw/ground_segment/wind/Makefile @@ -24,7 +24,7 @@ include ../../../conf/Makefile.local all: wind -INCLUDES= -I ../../lib/ocaml -I +lablgtk2 +INCLUDES= -I ../../lib/ocaml -I +lablgtk2 -I +xml-light OCAMLC= ocamlc $(INCLUDES) OCAMLMLI= ocamlc $(INCLUDES) diff --git a/sw/lib/ocaml/Makefile b/sw/lib/ocaml/Makefile index 7d63f97c8e..9902b90c7c 100644 --- a/sw/lib/ocaml/Makefile +++ b/sw/lib/ocaml/Makefile @@ -22,8 +22,8 @@ Q=@ -INCLUDES= -XINCLUDES= -I +lablgl -I +lablgtk2 +INCLUDES= -I +xml-light +XINCLUDES= -I +lablgl -I +lablgtk2 -I +xml-light OCAMLC=ocamlc $(INCLUDES) OCAMLOPT=ocamlopt $(INCLUDES) @@ -44,7 +44,7 @@ opt : all lib-pprz.cmxa xlib-pprz.cmxa lib-pprz.cma : $(CMO) @echo OL $@ - $(Q)ocamlmklib -o lib-pprz str.cma unix.cma xml-light.cma $^ + $(Q)ocamlmklib -I +xml-light -o lib-pprz str.cma unix.cma xml-light.cma $^ lib-pprz.cmxa : $(CMX) @echo OOL $@ @@ -52,11 +52,11 @@ lib-pprz.cmxa : $(CMX) xlib-pprz.cma : $(XCMO) @echo OL $@ - $(Q)ocamlmklib -o xlib-pprz $^ + $(Q)ocamlmklib -I +xml-light -o xlib-pprz $^ xlib-pprz.cmxa : $(XCMX) @echo OOL $@ - $(Q)ocamlmklib -o xlib-pprz $^ + $(Q)ocamlmklib -I +xml-light -o xlib-pprz $^ xml_get.out : lib-pprz.cma xml_get.cmo @echo OL $@ diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile index 6667194bab..4774d3a917 100644 --- a/sw/logalizer/Makefile +++ b/sw/logalizer/Makefile @@ -20,7 +20,7 @@ # Boston, MA 02111-1307, USA. # -OCAMLC = ocamlc +OCAMLC = ocamlc -I +xml-light OCAMLOPT = ocamlopt all: play @@ -32,4 +32,4 @@ play : play.ml $(OCAMLC) -custom -o $@ unix.cma glibivy-ocaml.cma -I +lablgtk2 -I ../lib/ocaml lablgtk.cma lib-pprz.cma gtkInit.cmo $^ plot_adc : plot_adc.c - gcc -Wall `pkg-config gtk+-2.0 --cflags` -o plot_adc plot_adc.c `pkg-config gtk+-2.0 --libs` -lgtkdatabox -lglibivy -lpcre \ No newline at end of file + gcc -Wall `pkg-config gtk+-2.0 --cflags` -o plot_adc plot_adc.c `pkg-config gtk+-2.0 --libs` -lgtkdatabox -lglibivy -lpcre diff --git a/sw/simulator/Makefile b/sw/simulator/Makefile index 286ea03631..044a0b2204 100644 --- a/sw/simulator/Makefile +++ b/sw/simulator/Makefile @@ -32,8 +32,8 @@ SIMSCMO=$(SIMSML:%.ml=%.cmo) SIMSCMX=$(SIMSML:%.ml=%.cmx) -OCAMLC = ocamlc -OCAMLOPT=ocamlopt -p +OCAMLC = ocamlc -I +xml-light +OCAMLOPT=ocamlopt -I +xml-light -p INCLUDES= -I +lablgtk2 -I ../lib/ocaml AIRBORNE = ../airborne diff --git a/sw/tools/Makefile b/sw/tools/Makefile index a420e7ac7d..4e444ea616 100644 --- a/sw/tools/Makefile +++ b/sw/tools/Makefile @@ -23,7 +23,7 @@ Q=@ OCAML=ocaml -OCAMLC=ocamlc -I ../lib/ocaml +OCAMLC=ocamlc -I ../lib/ocaml -I +xml-light OCAMLLEX=ocamllex OCAMLYACC=ocamlyacc