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

[build] tries to get correct dependency to pprzlink

Browse Source
This commit is contained in:
Gautier Hattenberger
2016-02-04 17:01:03 +01:00
parent 290b8a6d52
commit 2f582602a4
9 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/Makefile
+3 -3
View File
@@ -32,7 +32,7 @@ LIBS=
LIBSX=$(LIBS:.cma=.cmxa)
INCLUDES=
PKG = -package pprz.xlib
PKG = -package pprzlink,pprz.xlib
LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink
LABLGTK2INIT = $(shell ocamlfind query -p-format lablgtk2.init 2>/dev/null)
@@ -64,11 +64,11 @@ all : $(MAIN)
opt : $(MAIN).opt
$(MAIN) : $(CMO) $(LIBPPRZCMA) $(XLIBPPRZCMA)
$(MAIN) : $(CMO) $(LIBPPRZCMA) $(LIBPPRZLINKCMA) $(XLIBPPRZCMA)
@echo OL $@
$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LIBS) $(LINKPKG) $(CMO) -o $@
$(MAIN).opt : $(CMX) $(LIBPPRZCMXA) $(XLIBPPRZCMXA)
$(MAIN).opt : $(CMX) $(LIBPPRZCMXA) $(LIBPPRZLINKCMXA) $(XLIBPPRZCMXA)
@echo OOL $@
$(Q)$(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(LIBSX) -package pprz.xlib,$(LABLGTK2INIT) -linkpkg $(CMX) -o $@
sw/ground_segment/joystick/Makefile
+1 -1
View File
@@ -73,7 +73,7 @@ test_stick: test_sdl_stick.o
@echo BUILD $@
$(Q)$(CC) -g -O2 -DSTICK_DBG $(GLIB_CFLAGS) -o $@ $^ sdl_stick.c $(GLIB_LDFLAGS) $(SDL_LDFLAGS)
input2ivy: $(LIBPPRZCMA) $(INPUT2IVY_DEPS)
input2ivy: $(LIBPPRZCMA) $(LIBPPRZLINKCMA) $(INPUT2IVY_DEPS)
@echo OL $@
$(Q)$(OCAMLC) -o $@ $(LINKPKG) $^ $(ML_SDL_OCAMLFLAGS) $(ML_SDL_LFLAGS)
sw/ground_segment/tmtc/Makefile
+10 -10
View File
@@ -45,48 +45,48 @@ opt: server.opt
clean:
$(Q)rm -f link server messages settings *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge app_server gpsd2ivy c_ivy_client_example_1 c_ivy_client_example_2 c_ivy_client_example_3 ivy2nmea
messages : messages.cmo $(LIBPPRZCMA)
messages : messages.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
settings : settings.cmo ../cockpit/page_settings.cmo $(LIBPPRZCMA)
settings : settings.cmo ../cockpit/page_settings.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo -I ../cockpit gtk_save_settings.cmo saveSettings.cmo page_settings.cmo $<
server : $(SERVERCMO) $(LIBPPRZCMA)
server : $(SERVERCMO) $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(SERVERCMO)
server.opt : $(SERVERCMX) $(LIBPPRZCMXA)
server.opt : $(SERVERCMX) $(LIBPPRZCMXA) $(LIBPPRZLINKCMXA)
@echo OOL $@
$(Q)$(OCAMLOPT) $(INCLUDES) -o $@ -package glibivy,pprz -linkpkg $(SERVERCMX)
link : link.cmo $(LIBPPRZCMA)
link : link.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
ivy_tcp_aircraft : ivy_tcp_aircraft.cmo $(LIBPPRZCMA)
ivy_tcp_aircraft : ivy_tcp_aircraft.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
ivy_tcp_controller : ivy_tcp_controller.cmo $(LIBPPRZCMA)
ivy_tcp_controller : ivy_tcp_controller.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
broadcaster : broadcaster.cmo $(LIBPPRZCMA)
broadcaster : broadcaster.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
ivy2udp : ivy2udp.cmo $(LIBPPRZCMA)
ivy2udp : ivy2udp.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
150m : 150m.cmo $(LIBPPRZCMA)
150m : 150m.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
@echo OL $@
$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<