Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[makefile] set OCAMLC and OCAMLOPT to use ocamlfind

Browse Source
This commit is contained in:
Felix Ruess
2013-03-20 00:50:06 +01:00
parent 57fdb92921
commit 346fc0c416
10 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.sim
+1 -1
View File
@@ -83,7 +83,7 @@ autopilot.so : $($(TARGET).objs)
$(OBJDIR)/simsitl : autopilot.so $(SITLCMA) $(SIMSITLML)
@echo LD $@
$(Q)$(OCAMLFIND) $(OCAMLC) -g $(CAMLINCLUDES) -o $@ $(LINKPKG) $(MYGTKINITCMO) $^ -dllpath $(OBJDIR) -dllpath $(SIMDIR)
$(Q)$(OCAMLC) -g $(CAMLINCLUDES) -o $@ $(LINKPKG) $(MYGTKINITCMO) $^ -dllpath $(OBJDIR) -dllpath $(SIMDIR)
# The id of the A/C is hardcoded in the code (to be improved with dynlink ?)
sw/Makefile.ocaml
+2 -3
View File
@@ -23,10 +23,9 @@
# General ocaml compiling tools and pprz lib
OCAML = ocaml
OCAMLC = ocamlc
OCAMLOPT = ocamlopt
OCAMLC = ocamlfind ocamlc
OCAMLOPT = ocamlfind ocamlopt
OCAMLDEP = ocamldep
OCAMLFIND = ocamlfind
OCAMLMKLIB = ocamlmklib
LIBPPRZDIR = $(PAPARAZZI_SRC)/sw/lib/ocaml
LIBPPRZCMA = $(LIBPPRZDIR)/lib-pprz.cma
sw/ground_segment/cockpit/Makefile
+6 -6
View File
@@ -54,22 +54,22 @@ opt : $(MAIN).opt
$(MAIN) : $(CMO) $(XLIBPPRZCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LIBS) $(LINKPKG) myGtkInit.cmo $(CMO) -o $@
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LIBS) $(LINKPKG) myGtkInit.cmo $(CMO) -o $@
$(MAIN).opt : $(CMX)
@echo OOL $@
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(LIBSX) -package pprz.xlib,lablgtk2.init -linkpkg $(CMX) -o $@
$(Q)$(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(LIBSX) -package pprz.xlib,lablgtk2.init -linkpkg $(CMX) -o $@
%.cmo: %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(PKG) -c $<
%.cmi: %.mli
@echo OCI $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(PKG) -c $<
%.cmx: %.ml
@echo OOC $<
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(PKG) -c $<
saveSettings.cmo : gtk_save_settings.cmo
saveSettings.cmx: gtk_save_settings.cmx
@@ -90,7 +90,7 @@ strip.cmo : gtk_strip.cmo gtk_setting_time.cmo
compass : compass.ml
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LINKPKG) gtkInit.cmo $^ -o $@
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LINKPKG) gtkInit.cmo $^ -o $@
clean:
sw/ground_segment/joystick/Makefile
+2 -2
View File
@@ -62,7 +62,7 @@ test_stick: test_sdl_stick.o
input2ivy: sdl_stick.so input2ivy.cmo $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLINCLUDES) -o $@ $(LINKPKG) $(TOOLSDIR)/fp_proc.cmo $^ $(ML_SDL_LFLAGS)
$(Q)$(OCAMLC) $(OCAMLINCLUDES) -o $@ $(LINKPKG) $(TOOLSDIR)/fp_proc.cmo $^ $(ML_SDL_LFLAGS)
# dependency of input2ivy
input2ivy: $(LIBPPRZCMA) $(TOOLSDIR)/fp_proc.cmo
@@ -77,7 +77,7 @@ sdl_stick.so : sdl_stick.o ml_sdl_stick.o
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLINCLUDES) -c $(PKG) $<
$(Q)$(OCAMLC) $(OCAMLINCLUDES) -c $(PKG) $<
clean:
$(Q)rm -f *~ core *.o *.bak .depend test*stick *.cmo *.cmi input2ivy
sw/ground_segment/tmtc/Makefile
+15 -15
View File
@@ -62,73 +62,73 @@ $(VAR)/boa.conf :$(CONF)/boa.conf
messages : messages.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
settings : settings.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA) ../cockpit/page_settings.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo -I ../cockpit gtk_save_settings.cmo saveSettings.cmo page_settings.cmo $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo -I ../cockpit gtk_save_settings.cmo saveSettings.cmo page_settings.cmo $<
server : $(SERVERCMO) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(SERVERCMO)
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(SERVERCMO)
server.opt : $(SERVERCMX) $(LIBPPRZCMXA)
@echo OOL $@
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) -o $@ -package glibivy,pprz -linkpkg $(SERVERCMX)
$(Q)$(OCAMLOPT) $(INCLUDES) -o $@ -package glibivy,pprz -linkpkg $(SERVERCMX)
link : link.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
ivy_tcp_aircraft : ivy_tcp_aircraft.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
ivy_tcp_controller : ivy_tcp_controller.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
broadcaster : broadcaster.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
ivy2udp : ivy2udp.cmo $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
dia : dia.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
diadec : diadec.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
150m : 150m.cmo $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
settings.cmo : INCLUDES += -I ../cockpit
settings.cmo : ../cockpit/page_settings.cmi
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLC) $(INCLUDES) $(PKG) -c $<
%.cmx : %.ml
@echo OOC $<
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLOPT) $(INCLUDES) $(PKG) -c $<
%.cmi : %.mli
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) $(PKG) $<
$(Q)$(OCAMLC) $(INCLUDES) $(PKG) $<
CC = gcc
sw/lib/ocaml/Makefile
+12 -13
View File
@@ -24,10 +24,9 @@
Q=@
OCAMLC=ocamlc
OCAMLFIND=ocamlfind
OCAMLC=ocamlfind ocamlc
OCAMLOPT=ocamlfind ocamlopt
OCAMLDEP=ocamldep
OCAMLOPT=ocamlopt
OCAMLLEX=ocamllex
OCAMLYACC=ocamlyacc
OCAMLMKLIB=ocamlmklib
@@ -91,48 +90,48 @@ xlib-pprz.cmxa: | libxlib-pprz.a dllxlib-pprz.so
xml_get.out : lib-pprz.cma xml_get.cmo | opt
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package str,xml-light -linkpkg -I . $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ -package str,xml-light -linkpkg -I . $^
tests : lib-pprz.cma $(TESTS_CMO)
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,ivy -linkpkg -I . -dllpath . $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,ivy -linkpkg -I . -dllpath . $^
GTKCFLAGS := `pkg-config --cflags gtk+-2.0`
%.o : %.c
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(FPIC) $(INCLUDES) -package $(PKGCOMMON) -c $<
$(Q)$(OCAMLC) $(FPIC) $(INCLUDES) -package $(PKGCOMMON) -c $<
$(XCMO) $(XCMX) myGtkInit.cmo : PKGCOMMON=$(XPKGCOMMON)
ml_gtk_drag.o : ml_gtk_drag.c
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
$(Q)$(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
ml_gtkgl_hack.o : ml_gtkgl_hack.c
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
$(Q)$(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
camltm.o : register_example.cmo
$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -output-obj -o $@ -package unix,str,xml-light,ivy debug.cmo serial.cmo extXml.cmo env.cmo pprz.cmo tm.cmo
$(OCAMLC) $(INCLUDES) -output-obj -o $@ -package unix,str,xml-light,ivy debug.cmo serial.cmo extXml.cmo env.cmo pprz.cmo tm.cmo
caml_from_c_example : cserial.o convert.o caml_from_c_example.o camltm.o
$(CC) -o $@ $^ -L$(OCAMLLIBDIR) -lunix -lstr -livy-ocaml -lcamlrun -lm -livy -lcurses
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c $<
$(Q)$(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmx : %.ml
@echo OOC $<
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) -package $(PKGCOMMON) -c $<
$(Q)$(OCAMLOPT) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmi : %.mli
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(XINCLUDES) $(INCLUDES) -package $(PKGCOMMON),$(XPKGCOMMON) $<
$(Q)$(OCAMLC) $(XINCLUDES) $(INCLUDES) -package $(PKGCOMMON),$(XPKGCOMMON) $<
%.cmi : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(XINCLUDES) -package $(PKGCOMMON) -c $<
$(Q)$(OCAMLC) $(XINCLUDES) -package $(PKGCOMMON) -c $<
%.ml : %.mll
@echo OCL $<
sw/logalizer/Makefile
+8 -8
View File
@@ -37,23 +37,23 @@ all: play plotter plot sd2log plotprofile openlog2tlm
play : $(LIBPPRZCMA) log_file.cmo play_core.cmo play.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $^
play-nox : $(LIBPPRZCMA) play_core.cmo play-nox.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
plotter : $(LIBPPRZCMA) $(XLIBPPRZCMA) plotter.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
plot : $(LIBPPRZCMA) $(XLIBPPRZCMA) log_file.cmo gtk_export.cmo export.cmo plot.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
sd2log : $(LIBPPRZCMA) sd2log.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
CC = gcc
CFLAGS=-g -O2 -Wall
@@ -70,13 +70,13 @@ openlog2tlm: openlog2tlm.c
%.cmo: %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -c $(PKG) $<
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -c $(PKG) $<
%.cmi: %.mli
@echo OCI $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -c $(PKG) $<
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -c $(PKG) $<
%.cmx: %.ml
@echo OOC $<
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) -c $(PKG) $<
$(Q)$(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) -c $(PKG) $<
export.cmo : gtk_export.cmo
export.cmx : gtk_export.cmx
sw/simulator/Makefile
+6 -6
View File
@@ -57,7 +57,7 @@ fg.so : fg.o
simhitl : fg.so $(SIMHCMO) simhitl.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
sitl.cma : fg.o $(SIMSCMO)
@echo OL $@
@@ -69,15 +69,15 @@ sitl.cmxa : $(SIMSCMX)
gaia : gaia.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
diffusion : stdlib.cmo diffusion.cmo
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $^
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -c $(PKG) $<
$(Q)$(OCAMLC) $(INCLUDES) -c $(PKG) $<
%.o : %.c
@echo CC $<
@@ -85,11 +85,11 @@ diffusion : stdlib.cmo diffusion.cmo
%.cmx : %.ml
@echo OOC $<
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) -c $(PKG) $<
$(Q)$(OCAMLOPT) $(INCLUDES) -c $(PKG) $<
%.cmi : %.mli
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -c $(PKG) $<
$(Q)$(OCAMLC) $(INCLUDES) -c $(PKG) $<
# dependency on lib-pprz
simhitl diffusion gaia: $(LIBPPRZCMA)
sw/supervision/Makefile
+3 -3
View File
@@ -38,7 +38,7 @@ all: paparazzicenter
paparazzicenter : $(PAPARAZZICENTERCMO)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
gtk_pc.ml : paparazzicenter.glade
@echo GLADE $@
@@ -54,11 +54,11 @@ gtk_process.ml : paparazzicenter.glade
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -c $(XPKG) $<
$(Q)$(OCAMLC) $(INCLUDES) -c $(XPKG) $<
%.cmi : %.mli
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -c $(XPKG) $<
$(Q)$(OCAMLC) $(INCLUDES) -c $(XPKG) $<
pc_common.cmo: gtk_process.cmo
sw/tools/Makefile
+6 -6
View File
@@ -35,23 +35,23 @@ ABS_FP = $(FP_CMO:%=$$PAPARAZZI_SRC/sw/tools/%)
gen_flight_plan.out : $(FP_CMO)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
gen_srtm.out : gen_srtm.ml $(LIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
%.out : %.ml gen_common.cmo $(LIBPPRZCMA)
@echo OL $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gen_common.cmo $<
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gen_common.cmo $<
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLC) $(INCLUDES) $(PKG) -c $<
%.cmi : %.mli
@echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) $(PKG) -c $<
$(Q)$(OCAMLC) $(INCLUDES) $(PKG) -c $<
# dependency on lib-pprz
gen_flight_plan.out : $(LIBPPRZCMA)