diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile index 8cd1b16c5f..b1692ca399 100644 --- a/sw/ground_segment/cockpit/Makefile +++ b/sw/ground_segment/cockpit/Makefile @@ -44,7 +44,7 @@ opt : $(MAIN).opt $(MAIN) : $(CMO) ../../lib/ocaml/xlib-pprz.cma ../../lib/ocaml/lib-pprz.cma @echo OL $@ - $(Q)$(OCAMLC) $(OCAMLCFLAGS) -custom $(INCLUDES) unix.cma str.cma xml-light.cma $(LIBS) threads.cma gtkThread.cmo gtkInit.cmo $(CMO) -o $@ + $(Q)$(OCAMLC) $(OCAMLCFLAGS) -custom $(INCLUDES) unix.cma str.cma xml-light.cma $(LIBS) threads.cma gtkThread.cmo myGtkInit.cmo $(CMO) -o $@ $(MAIN).opt : $(CMX) @echo OOL $@ diff --git a/sw/lib/ocaml/Makefile b/sw/lib/ocaml/Makefile index 69631148d3..27ff83b2ee 100644 --- a/sw/lib/ocaml/Makefile +++ b/sw/lib/ocaml/Makefile @@ -36,9 +36,9 @@ XSRC = platform.ml wind_sock.ml mapCanvas.ml mapWaypoints.ml mapTrack.ml mapGoog XCMO = $(XSRC:.ml=.cmo) XCMX = $(XSRC:.ml=.cmx) -$(XCMO) $(XCMX) : INCLUDES=$(XINCLUDES) +$(XCMO) $(XCMX) myGtkInit.cmo : INCLUDES=$(XINCLUDES) -all : lib-pprz.cma xlib-pprz.cma xml_get.out opt +all : lib-pprz.cma xlib-pprz.cma myGtkInit.cmo xml_get.out opt opt : lib-pprz.cmxa xlib-pprz.cmxa diff --git a/sw/simulator/myGtkInit.ml b/sw/lib/ocaml/myGtkInit.ml similarity index 100% rename from sw/simulator/myGtkInit.ml rename to sw/lib/ocaml/myGtkInit.ml diff --git a/sw/simulator/Makefile b/sw/simulator/Makefile index de46e99ee3..aab79b72f9 100644 --- a/sw/simulator/Makefile +++ b/sw/simulator/Makefile @@ -41,7 +41,7 @@ VARINCLUDE=$(PAPARAZZI_HOME)/var/include ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT) LAUNCHSITL = launchsitl -all : gaia sitl.cma $(LAUNCHSITL) myGtkInit.cmo +all : gaia sitl.cma $(LAUNCHSITL) @chmod a+x $(LAUNCHSITL) simhitl : fg.o $(SIMHCMO) simhitl.cmo