Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 03:27:33 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[makefile] cleaning makefiles from -custom param for ocaml

Browse Source
This commit is contained in:
Gautier Hattenberger
2013-02-21 20:00:09 +01:00
committed by Felix Ruess
parent cf7121934f
commit 69ddd2cabd
4 changed files with 63 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/Makefile
+12 -17
View File
@@ -33,19 +33,14 @@ else
endif endif
FPIC=-fPIC FPIC=-fPIC
OCAMLC=ocamlc include ../../Makefile.ocaml
OCAMLOPT=ocamlopt
OCAMLDEP=ocamldep INCLUDES=
OCAMLOPTFLAGS=-thread LIBS= lablglade.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma
OCAMLNETINCLUDES=$(shell ocamlfind query -r -i-format netstring) $(shell ocamlfind query -r -i-format netclient)
OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring) $(shell ocamlfind query -r -a-format -predicates byte netclient)
LIBPPRZDIR=../../lib/ocaml
INCLUDES= $(shell ocamlfind query -r -i-format lablgtk2) -I $(LIBPPRZDIR) $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format pcre) $(OCAMLNETINCLUDES)
LIBS=$(OCAMLNETCMA) glibivy-ocaml.cma lablgtk.cma lablglade.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma
CMXA=$(LIBS:.cma=.cmxa) CMXA=$(LIBS:.cma=.cmxa)
LIBPPRZCMA=$(LIBPPRZDIR)/lib-pprz.cma
LIBPPRZCMXA=$(LIBPPRZCMA:.cma=.cmxa) INCLUDES= -I $(LIBPPRZDIR) -I ../multimon
XLIBPPRZCMA=$(LIBPPRZDIR)/xlib-pprz.cma PKGCOMMON=unix,str,lablgtk2,ivy,xml-light,netstring,netclient,threads
ML= gtk_setting_time.ml gtk_strip.ml horizon.ml strip.ml gtk_save_settings.ml saveSettings.ml page_settings.ml pages.ml speech.ml plugin.ml sectors.ml map2d.ml editFP.ml live.ml particules.ml papgets.ml gcs.ml ML= gtk_setting_time.ml gtk_strip.ml horizon.ml strip.ml gtk_save_settings.ml saveSettings.ml page_settings.ml pages.ml speech.ml plugin.ml sectors.ml map2d.ml editFP.ml live.ml particules.ml papgets.ml gcs.ml
MAIN=gcs MAIN=gcs
@@ -58,22 +53,22 @@ opt : $(MAIN).opt
$(MAIN) : $(CMO) $(XLIBPPRZCMA) $(LIBPPRZCMA) $(MAIN) : $(CMO) $(XLIBPPRZCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) $(OCAMLCFLAGS) -custom $(INCLUDES) $(OCAMLNETINCLUDES) unix.cma str.cma netstring.cma netclient.cma xml-light.cma $(LIBS) threads.cma gtkThread.cmo myGtkInit.cmo $(CMO) -o $@ $(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -package $(PKGCOMMON) -linkpkg $(LIBS) gtkThread.cmo myGtkInit.cmo $(CMO) -o $@
$(MAIN).opt : $(CMX) $(MAIN).opt : $(CMX)
@echo OOL $@ @echo OOL $@
$(Q)$(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) str.cmxa unix.cmxa xml-light.cmxa $(LIBS:.cma=.cmxa) threads.cmxa gtkThread.cmx gtkInit.cmx $(CMX) -o $@ $(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) -package $(PKGCOMMON) -linkpkg $(LIBS:.cma=.cmxa) gtkThread.cmx gtkInit.cmx $(CMX) -o $@
%.cmo: %.ml %.cmo: %.ml
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmi: %.mli %.cmi: %.mli
@echo OCI $< @echo OCI $<
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmx: %.ml %.cmx: %.ml
@echo OOC $< @echo OOC $<
$(Q)$(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) -package $(PKGCOMMON) -c $<
saveSettings.cmo : gtk_save_settings.cmo saveSettings.cmo : gtk_save_settings.cmo
saveSettings.cmx: gtk_save_settings.cmx saveSettings.cmx: gtk_save_settings.cmx
sw/ground_segment/tmtc/Makefile
+20 -28
View File
@@ -32,21 +32,12 @@ endif
include ../../../conf/Makefile.local include ../../../conf/Makefile.local
include ../../Makefile.ocaml
CONF = ../../../conf CONF = ../../../conf
VAR = ../../../var VAR = ../../../var
OCAMLC = ocamlc INCLUDES= -I $(LIBPPRZDIR) -I ../multimon
OCAMLOPT = ocamlopt PKGCOMMON=unix,str,lablgtk2,ivy,xml-light,netstring,netclient
OCAMLDEP = ocamldep
LIBPPRZDIR = ../../lib/ocaml
OCAMLNETINCLUDES=$(shell ocamlfind query -r -i-format netstring) $(shell ocamlfind query -r -i-format netclient)
OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring)
INCLUDES= -I $(LIBPPRZDIR) -I ../multimon $(shell ocamlfind query -r -i-format lablgtk2) $(shell ocamlfind query -r -i-format xml-light) $(OCAMLNETINCLUDES)
LIBPPRZCMA=$(LIBPPRZDIR)/lib-pprz.cma
LIBPPRZCMXA=$(LIBPPRZCMA:.cma=.cmxa)
XLIBPPRZCMA=$(LIBPPRZDIR)/xlib-pprz.cma
XLIBPPRZCMXA=$(XLIBPPRZCMA:.cma=.cmxa)
LIBMULTIMONCMA=../multimon/multimon.cma LIBMULTIMONCMA=../multimon/multimon.cma
@@ -54,7 +45,8 @@ SERVERCMO = server_globals.cmo aircraft.cmo wind.cmo airprox.cmo kml.cmo fw_serv
SERVERCMX = $(SERVERCMO:.cmo=.cmx) SERVERCMX = $(SERVERCMO:.cmo=.cmx)
all: link server messages settings dia diadec $(VAR)/boa.conf ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge all: link server messages dia diadec $(VAR)/boa.conf ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge
#settings
clean: clean:
rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge gpsd2ivy c_ivy_client_example_1 c_ivy_client_example_2 c_ivy_client_example_3 rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge gpsd2ivy c_ivy_client_example_1 c_ivy_client_example_2 c_ivy_client_example_3
@@ -67,75 +59,75 @@ $(VAR)/boa.conf :$(CONF)/boa.conf
messages : messages.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA) messages : messages.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) gtkInit.cmo $<
settings : settings.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA) ../cockpit/page_settings.cmo settings : settings.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA) ../cockpit/page_settings.cmo
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -I ../cockpit -o $@ unix.cma str.cma xml-light.cma lablgtk.cma lablglade.cma $(OCAMLNETCMA) glibivy-ocaml.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma gtkInit.cmo gtk_save_settings.cmo saveSettings.cmo page_settings.cmo $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg lablglade.cma lablgnomecanvas.cma gtkInit.cmo -I ../cockpit gtk_save_settings.cmo saveSettings.cmo page_settings.cmo $(OCAMLDLL) $(LIBPPRZCMA) $(OCAMLXDLL) $(XLIBPPRZCMA) $<
server : $(SERVERCMO) $(LIBPPRZCMA) server : $(SERVERCMO) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma $(SERVERCMO) $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) $(SERVERCMO)
server.opt : $(SERVERCMX) $(LIBPPRZCMXA) server.opt : $(SERVERCMX) $(LIBPPRZCMXA)
@echo OOL $@ @echo OOL $@
$(Q)$(OCAMLOPT) $(INCLUDES) -o $@ str.cmxa unix.cmxa xml-light.cmxa lablgtk.cmxa glibivy-ocaml.cmxa lib-pprz.cmxa $(SERVERCMX) $(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMXA) $(SERVERCMX)
link : link.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA) link : link.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) multimon.cma $<
ivy_tcp_aircraft : ivy_tcp_aircraft.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA) ivy_tcp_aircraft : ivy_tcp_aircraft.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) multimon.cma $<
ivy_tcp_controller : ivy_tcp_controller.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA) ivy_tcp_controller : ivy_tcp_controller.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) multimon.cma $<
broadcaster : broadcaster.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA) broadcaster : broadcaster.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) multimon.cma $<
ivy2udp : ivy2udp.cmo $(LIBPPRZCMA) ivy2udp : ivy2udp.cmo $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) $<
dia : dia.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA) dia : dia.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) multimon.cma $<
diadec : diadec.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA) diadec : diadec.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) multimon.cma $<
150m : 150m.cmo $(LIBPPRZCMA) 150m : 150m.cmo $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package $(PKGCOMMON) -linkpkg $(OCAMLDLL) $(LIBPPRZCMA) gtkInit.cmo $<
settings.cmo : INCLUDES += -I ../cockpit settings.cmo : INCLUDES += -I ../cockpit
settings.cmo : ../cockpit/page_settings.cmi settings.cmo : ../cockpit/page_settings.cmi
%.cmo : %.ml %.cmo : %.ml
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmx : %.ml %.cmx : %.ml
@echo OOC $< @echo OOC $<
$(Q)$(OCAMLOPT) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmi : %.mli %.cmi : %.mli
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(INCLUDES) $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) $<
CC = gcc CC = gcc
sw/lib/ocaml/Makefile
+27 -22
View File
@@ -30,6 +30,7 @@ OCAMLDEP=ocamldep
OCAMLOPT=ocamlopt OCAMLOPT=ocamlopt
OCAMLLEX=ocamllex OCAMLLEX=ocamllex
OCAMLYACC=ocamlyacc OCAMLYACC=ocamlyacc
OCAMLMKLIB=ocamlmklib
OCAMLLIBDIR=$(shell $(OCAMLC) -where) OCAMLLIBDIR=$(shell $(OCAMLC) -where)
# default directory for temporary files # default directory for temporary files
@@ -46,21 +47,25 @@ else
FPIC = FPIC =
endif endif
INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format netclient) INCLUDES=
XINCLUDES= $(shell ocamlfind query -r -i-format lablgtk2) $(shell ocamlfind query -r -i-format xml-light) #$(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format netclient) $(shell ocamlfind query -r -i-format ivy)
PKGCOMMON=xml-light,netclient,ivy,lablgtk2
XINCLUDES=
#$(shell ocamlfind query -r -i-format lablgtk2) $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format ivy)
XPKGCOMMON=lablgtk2,xml-light,ivy
SRC = fig.ml debug.ml base64.ml serial.ml ocaml_tools.ml expr_syntax.ml expr_parser.ml expr_lexer.ml extXml.ml env.ml xml2h.ml latlong.ml egm96.ml srtm.ml http.ml maps_support.ml gm.ml iGN.ml geometry_2d.ml cserial.o convert.o ubx.ml pprz.ml xbee.ml logpprz.ml xmlCom.ml os_calls.ml editAirframe.ml defivybus.ml SRC = fig.ml debug.ml base64.ml serial.ml ocaml_tools.ml expr_syntax.ml expr_parser.ml expr_lexer.ml extXml.ml env.ml xml2h.ml latlong.ml egm96.ml srtm.ml http.ml maps_support.ml gm.ml iGN.ml geometry_2d.ml cserial.o convert.o ubx.ml pprz.ml xbee.ml logpprz.ml xmlCom.ml os_calls.ml editAirframe.ml defivybus.ml
CMO = $(SRC:.ml=.cmo) CMO = $(SRC:.ml=.cmo)
CMX = $(SRC:.ml=.cmx) CMX = $(SRC:.ml=.cmx)
XSRC = gtk_tools.ml platform.ml wind_sock.ml gtk_papget_editor.ml gtk_papget_text_editor.ml gtk_papget_gauge_editor.ml gtk_papget_led_editor.ml papget_common.ml papget_renderer.ml papget.ml mapCanvas.ml mapWaypoints.ml mapTrack.ml mapGoogle.ml mapIGN.ml ml_gtk_drag.o xmlEdit.ml mapFP.ml XSRC = gtk_tools.ml platform.ml wind_sock.ml gtk_papget_editor.ml gtk_papget_text_editor.ml gtk_papget_gauge_editor.ml gtk_papget_led_editor.ml papget_common.ml papget_renderer.ml papget.ml mapCanvas.ml mapWaypoints.ml mapTrack.ml mapGoogle.ml mapIGN.ml xmlEdit.ml mapFP.ml
XCMO = $(XSRC:.ml=.cmo) XCMO = $(XSRC:.ml=.cmo)
XCMX = $(XSRC:.ml=.cmx) XCMX = $(XSRC:.ml=.cmx)
TESTS_SRC = test/test_latlong.ml TESTS_SRC = test/test_latlong.ml
TESTS_CMO = $(TESTS_SRC:.ml=.cmo) TESTS_CMO = $(TESTS_SRC:.ml=.cmo)
$(XCMO) $(XCMX) myGtkInit.cmo : INCLUDES=$(XINCLUDES) OCAMLDLL = -dllpath $(shell ocamlfind query ivy)
all : lib-pprz.cma xlib-pprz.cma myGtkInit.cmo xml_get.out opt all : lib-pprz.cma xlib-pprz.cma myGtkInit.cmo xml_get.out opt
opt : lib-pprz.cmxa xlib-pprz.cmxa opt : lib-pprz.cmxa xlib-pprz.cmxa
@@ -68,19 +73,19 @@ opt : lib-pprz.cmxa xlib-pprz.cmxa
lib-pprz.cma liblib-pprz.a: $(CMO) lib-pprz.cma liblib-pprz.a: $(CMO)
@echo OL $@ @echo OL $@
$(Q)ocamlmklib $(VERBOSITY) $(INCLUDES) -o lib-pprz $^ $(Q)$(OCAMLMKLIB) $(VERBOSITY) $(INCLUDES) -o lib-pprz $^
lib-pprz.cmxa dlllib-pprz.so: $(CMX) lib-pprz.cmxa dlllib-pprz.so: $(CMX)
@echo OOL $@ @echo OOL $@
$(Q)ocamlmklib $(VERBOSITY) $(INCLUDES) -o lib-pprz $^ $(Q)$(OCAMLMKLIB) $(VERBOSITY) $(INCLUDES) -o lib-pprz $^
xlib-pprz.cma libxlib-pprz.a: $(XCMO) xlib-pprz.cma libxlib-pprz.a: $(XCMO) ml_gtk_drag.o
@echo OL $@ @echo OL $@
$(Q)ocamlmklib $(VERBOSITY) $(XINCLUDES) -o xlib-pprz $^ $(Q)$(OCAMLMKLIB) $(VERBOSITY) $(XINCLUDES) -o xlib-pprz $^
xlib-pprz.cmxa dllxlib-pprz.so: $(XCMX) xlib-pprz.cmxa dllxlib-pprz.so: $(XCMX) ml_gtk_drag.o
@echo OOL $@ @echo OOL $@
$(Q)ocamlmklib $(VERBOSITY) $(XINCLUDES) -o xlib-pprz $^ $(Q)$(OCAMLMKLIB) $(VERBOSITY) $(XINCLUDES) -o xlib-pprz $^
# trying to set correct dependencies for parallel build # trying to set correct dependencies for parallel build
# these are order only depedencies # these are order only depedencies
@@ -90,48 +95,48 @@ xlib-pprz.cmxa: | libxlib-pprz.a dllxlib-pprz.so
xml_get.out : lib-pprz.cma xml_get.cmo | opt xml_get.out : lib-pprz.cma xml_get.cmo | opt
@echo OL $@ @echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ str.cma xml-light.cma -I . $^ $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package str,xml-light -linkpkg -I . $^
tests : lib-pprz.cma $(TESTS_CMO) tests : lib-pprz.cma $(TESTS_CMO)
$(OCAMLC) $(INCLUDES) -custom -I . -o $@ str.cma unix.cma ivy-ocaml.cma xml-light.cma $^ $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,ivy -linkpkg -I . -dllpath . $^
GTKCFLAGS := `pkg-config --cflags gtk+-2.0` GTKCFLAGS := `pkg-config --cflags gtk+-2.0`
#GTKCFLAGS := -I/usr/lib/gtk-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo
# GTKCFLAGS := $(shell gtk-config --cflags)
%.o : %.c %.o : %.c
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(FPIC) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLC) $(FPIC) $(INCLUDES) -package $(PKGCOMMON) -c $<
$(XCMO) $(XCMX) myGtkInit.cmo : PKGCOMMON=$(XPKGCOMMON)
ml_gtk_drag.o : ml_gtk_drag.c ml_gtk_drag.o : ml_gtk_drag.c
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(INCLUDES) -c -ccopt "$(GTKCFLAGS)" $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
ml_gtkgl_hack.o : ml_gtkgl_hack.c ml_gtkgl_hack.o : ml_gtkgl_hack.c
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(INCLUDES) -c -ccopt "$(GTKCFLAGS)" $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
camltm.o : register_example.cmo camltm.o : register_example.cmo
$(OCAMLC) $(INCLUDES) -output-obj -o $@ unix.cma str.cma xml-light.cma ivy-ocaml.cma debug.cmo serial.cmo extXml.cmo env.cmo pprz.cmo tm.cmo $(OCAMLFIND) $(OCAMLC) $(INCLUDES) -output-obj -o $@ unix.cma str.cma xml-light.cma ivy-ocaml.cma 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 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 $(CC) -o $@ $^ -L$(OCAMLLIBDIR) -lunix -lstr -livy-ocaml -lcamlrun -lm -livy -lcurses
%.cmo : %.ml %.cmo : %.ml
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmx : %.ml %.cmx : %.ml
@echo OOC $< @echo OOC $<
$(Q)$(OCAMLOPT) $(INCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLOPT) $(INCLUDES) -package $(PKGCOMMON) -c $<
%.cmi : %.mli %.cmi : %.mli
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(XINCLUDES) $(INCLUDES) $< $(Q)$(OCAMLFIND) $(OCAMLC) $(XINCLUDES) $(INCLUDES) -package $(PKGCOMMON),$(XPKGCOMMON) $<
%.cmi : %.ml %.cmi : %.ml
@echo OC $< @echo OC $<
$(Q)$(OCAMLC) $(XINCLUDES) -c $< $(Q)$(OCAMLFIND) $(OCAMLC) $(XINCLUDES) -package $(PKGCOMMON) -c $<
%.ml : %.mll %.ml : %.mll
@echo OCL $< @echo OCL $<
sw/tools/Makefile
+4 -13
View File
@@ -22,16 +22,7 @@
# Quiet compilation # Quiet compilation
Q=@ Q=@
OCAML=ocaml include ../Makefile.ocaml
OCAMLFIND=ocamlfind
OCAMLC=ocamlc
OCAMLDEP=ocamldep
LIBPPRZDIR=$(PAPARAZZI_SRC)/sw/lib/ocaml
INCLUDES=-I $(LIBPPRZDIR)
LIBPPRZCMA=$(LIBPPRZDIR)/lib-pprz.cma
# since the ivy-ocaml lib currently can't be found with ocamlfind, specify the path directly with -dllpath
LIBIVYDIR=/usr/lib/ocaml
all: gen_common.cmo gen_aircraft.out gen_airframe.out gen_messages2.out gen_messages.out gen_ubx.out gen_mtk.out gen_flight_plan.out gen_radio.out gen_periodic.out gen_settings.out gen_xsens.out gen_modules.out gen_autopilot.out gen_abi.out find_free_msg_id.out gen_srtm.out mergelogs all: gen_common.cmo gen_aircraft.out gen_airframe.out gen_messages2.out gen_messages.out gen_ubx.out gen_mtk.out gen_flight_plan.out gen_radio.out gen_periodic.out gen_settings.out gen_xsens.out gen_modules.out gen_autopilot.out gen_abi.out find_free_msg_id.out gen_srtm.out mergelogs
@@ -40,15 +31,15 @@ ABS_FP = $(FP_CMO:%=$$PAPARAZZI_SRC/sw/tools/%)
gen_flight_plan.out : $(FP_CMO) gen_flight_plan.out : $(FP_CMO)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light -linkpkg -dllpath $(LIBIVYDIR) ivy-ocaml.cma -dllpath $(LIBPPRZDIR) lib-pprz.cma $^ $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,ivy -linkpkg $(OCAMLDLL) lib-pprz.cma $^
gen_srtm.out : gen_srtm.ml gen_common.cmo $(LIBPPRZCMA) gen_srtm.out : gen_srtm.ml gen_common.cmo $(LIBPPRZCMA)
@echo OC $@ @echo OC $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,netclient -linkpkg -dllpath $(LIBIVYDIR) ivy-ocaml.cma -dllpath $(LIBPPRZDIR) lib-pprz.cma $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,netclient,ivy -linkpkg $(OCAMLDLL) lib-pprz.cma $<
%.out : %.ml gen_common.cmo $(LIBPPRZCMA) %.out : %.ml gen_common.cmo $(LIBPPRZCMA)
@echo OC $< @echo OC $<
$(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light -linkpkg -dllpath $(LIBIVYDIR) ivy-ocaml.cma -dllpath $(LIBPPRZDIR) lib-pprz.cma gen_common.cmo $< $(Q)$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,ivy -linkpkg $(OCAMLDLL) lib-pprz.cma gen_common.cmo $<
# disable this for now and use the compiled bytecode # disable this for now and use the compiled bytecode
#@cat ../../pprz_src_test.sh > $@ #@cat ../../pprz_src_test.sh > $@