Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 13:55:40 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[build] use VPATH for pprzlink

Browse Source 
for better dependency resolution and avoid having home/var/share/pprzlink instead of pprzlink in var/aircrafts/<AC>/<target>
This commit is contained in:
Felix Ruess
2016-02-12 14:48:39 +01:00
parent f305882b20
commit 6e75ed84e2
20 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/chibios/chibios_rules.mk
+1 -1
View File
@@ -99,7 +99,7 @@ endif
CPPFLAGS += -MD -MP -MF .dep/$(@F).d CPPFLAGS += -MD -MP -MF .dep/$(@F).d
# Paths where to search for sources # Paths where to search for sources
VPATH = $(SRCPATHS) VPATH += $(SRCPATHS)
# #
# Include user extra rules if any # Include user extra rules if any
conf/firmwares/demo.makefile
+1
View File
@@ -35,6 +35,7 @@ SRC_MODULES=modules
CFG_SHARED=$(PAPARAZZI_SRC)/conf/firmwares/subsystems/shared CFG_SHARED=$(PAPARAZZI_SRC)/conf/firmwares/subsystems/shared
VPATH += $(PAPARAZZI_HOME)/var/share
# #
# common test # common test
conf/firmwares/fixedwing.makefile
+1 -1
View File
@@ -20,7 +20,7 @@ SRC_MODULES=modules
FIXEDWING_INC = -I$(SRC_FIRMWARE) -I$(SRC_FIXEDWING) -I$(SRC_BOARD) FIXEDWING_INC = -I$(SRC_FIRMWARE) -I$(SRC_FIXEDWING) -I$(SRC_BOARD)
VPATH += $(PAPARAZZI_HOME)/var/share
# Standard Fixed Wing Code # Standard Fixed Wing Code
include $(CFG_FIXEDWING)/autopilot.makefile include $(CFG_FIXEDWING)/autopilot.makefile
conf/firmwares/rotorcraft.makefile
+2 -1
View File
@@ -33,10 +33,11 @@ SRC_ARCH=arch/$(ARCH)
ROTORCRAFT_INC = -I$(SRC_FIRMWARE) -I$(SRC_BOARD) ROTORCRAFT_INC = -I$(SRC_FIRMWARE) -I$(SRC_BOARD)
ap.ARCHDIR = $(ARCH) ap.ARCHDIR = $(ARCH)
VPATH += $(PAPARAZZI_HOME)/var/share
###################################################################### ######################################################################
## ##
## COMMON ROTORCRAFT ALL TARGETS (AP + NPS) ## COMMON ROTORCRAFT ALL TARGETS (AP + NPS)
conf/firmwares/setup.makefile
+3 -1
View File
@@ -12,6 +12,8 @@ CFG_SHARED=$(PAPARAZZI_SRC)/conf/firmwares/subsystems/shared
SRC_FIRMWARE=firmwares/setup SRC_FIRMWARE=firmwares/setup
VPATH += $(PAPARAZZI_HOME)/var/share
# #
# common setup # common setup
# #
@@ -110,7 +112,7 @@ setup_actuators.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD)
SETUP_ACTUATORS_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z) SETUP_ACTUATORS_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z)
setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(SETUP_ACTUATORS_MODEM_PORT_LOWER) -DPPRZ_UART=$(SETUP_ACTUATORS_MODEM_PORT_LOWER) setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(SETUP_ACTUATORS_MODEM_PORT_LOWER) -DPPRZ_UART=$(SETUP_ACTUATORS_MODEM_PORT_LOWER)
setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
setup_actuators.srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c setup_actuators.srcs += subsystems/datalink/downlink.c pprzlink/src/pprz_transport.c
setup_actuators.srcs += subsystems/actuators.c setup_actuators.srcs += subsystems/actuators.c
setup_actuators.srcs += $(SRC_FIRMWARE)/setup_actuators.c setup_actuators.srcs += $(SRC_FIRMWARE)/setup_actuators.c
conf/firmwares/subsystems/fixedwing/autopilot.makefile
+1 -1
View File
@@ -196,7 +196,7 @@ sim.CFLAGS += -DSITL
sim.srcs += $(SRC_ARCH)/sim_ap.c sim.srcs += $(SRC_ARCH)/sim_ap.c
sim.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp sim.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp
sim.srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(SRC_FIRMWARE)/fixedwing_datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/ivy_transport.c subsystems/datalink/telemetry.c $(SRC_FIRMWARE)/ap_downlink.c $(SRC_FIRMWARE)/fbw_downlink.c sim.srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(SRC_FIRMWARE)/fixedwing_datalink.c pprzlink/src/ivy_transport.c subsystems/datalink/telemetry.c $(SRC_FIRMWARE)/ap_downlink.c $(SRC_FIRMWARE)/fbw_downlink.c
sim.srcs += $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_adc_generic.c sim.srcs += $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_adc_generic.c
conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile
+1 -1
View File
@@ -26,7 +26,7 @@ nps.LDFLAGS += $(shell sdl-config --libs)
# #
# add the simulator directory to the make searchpath # add the simulator directory to the make searchpath
# #
VPATH = $(PAPARAZZI_SRC)/sw/simulator VPATH += $(PAPARAZZI_SRC)/sw/simulator
NPSDIR = nps NPSDIR = nps
nps.srcs += $(NPSDIR)/nps_main.c \ nps.srcs += $(NPSDIR)/nps_main.c \
conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
+1 -1
View File
@@ -41,7 +41,7 @@ endif
# #
# add the simulator directory to the make searchpath # add the simulator directory to the make searchpath
# #
VPATH = $(PAPARAZZI_SRC)/sw/simulator VPATH += $(PAPARAZZI_SRC)/sw/simulator
NPSDIR = nps NPSDIR = nps
nps.srcs += $(NPSDIR)/nps_main.c \ nps.srcs += $(NPSDIR)/nps_main.c \
conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
+1 -1
View File
@@ -37,7 +37,7 @@ endif
# #
# add the simulator directory to the make searchpath # add the simulator directory to the make searchpath
# #
VPATH = $(PAPARAZZI_SRC)/sw/simulator VPATH += $(PAPARAZZI_SRC)/sw/simulator
NPSDIR = nps NPSDIR = nps
nps.srcs += $(NPSDIR)/nps_main.c \ nps.srcs += $(NPSDIR)/nps_main.c \
conf/firmwares/subsystems/rotorcraft/intermcu_uart.makefile
+2 -2
View File
@@ -7,7 +7,7 @@ ifeq ($(TARGET),fbw)
INTERMCU_PORT_LOWER = $(shell echo $(INTERMCU_PORT) | tr A-Z a-z) INTERMCU_PORT_LOWER = $(shell echo $(INTERMCU_PORT) | tr A-Z a-z)
fbw.CFLAGS += -DINTERMCU_LINK=$(INTERMCU_PORT_LOWER) -DUSE_$(INTERMCU_PORT) -D$(INTERMCU_PORT)_BAUD=B230400 fbw.CFLAGS += -DINTERMCU_LINK=$(INTERMCU_PORT_LOWER) -DUSE_$(INTERMCU_PORT) -D$(INTERMCU_PORT)_BAUD=B230400
fbw.CFLAGS += -DINTER_MCU_FBW -DDOWNLINK fbw.CFLAGS += -DINTER_MCU_FBW -DDOWNLINK
fbw.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c fbw.srcs += pprzlink/src/pprz_transport.c
fbw.srcs += subsystems/intermcu/intermcu_fbw.c fbw.srcs += subsystems/intermcu/intermcu_fbw.c
else else
INTERMCU_PORT ?= UART3 INTERMCU_PORT ?= UART3
@@ -18,6 +18,6 @@ else
$(TARGET).CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED) $(TARGET).CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
ap.srcs += subsystems/intermcu/intermcu_ap.c ap.srcs += subsystems/intermcu/intermcu_ap.c
ap.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c ap.srcs += pprzlink/src/pprz_transport.c
$(TARGET).srcs += subsystems/radio_control.c $(TARGET).srcs += subsystems/radio_control.c
endif endif
conf/firmwares/subsystems/shared/sdlog.makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# Hey Emacs, this is a -*- makefile -*- # Hey Emacs, this is a -*- makefile -*-
sdlog_CFLAGS = -DDOWNLINK -DUSE_PPRZLOG sdlog_CFLAGS = -DDOWNLINK -DUSE_PPRZLOG
sdlog_srcs = subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprzlog_transport.c sdlog_srcs = subsystems/datalink/downlink.c pprzlink/src/pprzlog_transport.c
ap.CFLAGS += $(sdlog_CFLAGS) ap.CFLAGS += $(sdlog_CFLAGS)
ap.srcs += $(sdlog_srcs) ap.srcs += $(sdlog_srcs)
conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile
+1 -1
View File
@@ -32,4 +32,4 @@ ap.CFLAGS += -DMODEM_LED=$(MODEM_LED)
endif endif
ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c subsystems/datalink/datalink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c subsystems/datalink/datalink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c
ap.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c ap.srcs += pprzlink/src/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_ivy.makefile
+1 -1
View File
@@ -1,3 +1,3 @@
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp
$(TARGET).srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/ivy_transport.c $(TARGET).srcs += pprzlink/src/ivy_transport.c
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
+1 -1
View File
@@ -7,4 +7,4 @@ $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=superbitrf
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF
$(TARGET).srcs += peripherals/cyrf6936.c $(TARGET).srcs += peripherals/cyrf6936.c
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/superbitrf.c pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_transparent.makefile
+1 -1
View File
@@ -13,5 +13,5 @@ $(TARGET).CFLAGS += -D$(PPRZ_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD)
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(PPRZ_MODEM_PORT_LOWER) -DPPRZ_UART=$(PPRZ_MODEM_PORT_LOWER) $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(PPRZ_MODEM_PORT_LOWER) -DPPRZ_UART=$(PPRZ_MODEM_PORT_LOWER)
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile
+1 -1
View File
@@ -19,5 +19,5 @@ TELEM_CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
$(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS) $(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS)
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile
+1 -1
View File
@@ -4,7 +4,7 @@
$(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial $(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL
$(TARGET).CFLAGS += -DPERIODIC_TELEMETRY $(TARGET).CFLAGS += -DPERIODIC_TELEMETRY
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
ifeq ($(ARCH), lpc21) ifeq ($(ARCH), lpc21)
$(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c $(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c
conf/firmwares/subsystems/shared/telemetry_w5100.makefile
+1 -1
View File
@@ -10,7 +10,7 @@ W5100_MULTICAST_PORT ?= "1234"
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0 $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=W5100 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=W5100
$(TARGET).CFLAGS += -DW5100_IP=$(W5100_IP) -DW5100_SUBNET=$(W5100_SUBNET) -DW5100_MULTICAST_IP=$(W5100_MULTICAST_IP) -DW5100_MULTICAST_PORT=$(W5100_MULTICAST_PORT) $(TARGET).CFLAGS += -DW5100_IP=$(W5100_IP) -DW5100_SUBNET=$(W5100_SUBNET) -DW5100_MULTICAST_IP=$(W5100_MULTICAST_IP) -DW5100_MULTICAST_PORT=$(W5100_MULTICAST_PORT)
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/w5100.c pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
ifeq ($(ARCH), lpc21) ifeq ($(ARCH), lpc21)
# only an issue of setting the DRDY pin in w5100.c, which is stm32 specific # only an issue of setting the DRDY pin in w5100.c, which is stm32 specific
conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile
+1 -1
View File
@@ -14,4 +14,4 @@ $(TARGET).CFLAGS += -D$(XBEE_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD) -DXBEE_BAUD=$(
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(XBEE_MODEM_PORT_LOWER) $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(XBEE_MODEM_PORT_LOWER)
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c
conf/firmwares/test_progs.makefile
+2 -1
View File
@@ -35,6 +35,7 @@ SRC_MODULES=modules
CFG_SHARED=$(PAPARAZZI_SRC)/conf/firmwares/subsystems/shared CFG_SHARED=$(PAPARAZZI_SRC)/conf/firmwares/subsystems/shared
VPATH += $(PAPARAZZI_HOME)/var/share
# #
# common test # common test
@@ -70,7 +71,7 @@ endif
# pprz downlink/datalink # pprz downlink/datalink
COMMON_TELEMETRY_CFLAGS = -DDOWNLINK -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ COMMON_TELEMETRY_CFLAGS = -DDOWNLINK -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
COMMON_TELEMETRY_SRCS = subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c COMMON_TELEMETRY_SRCS = subsystems/datalink/downlink.c pprzlink/src/pprz_transport.c
# check if we are using UDP # check if we are using UDP
ifneq (,$(findstring UDP, $(MODEM_DEV))) ifneq (,$(findstring UDP, $(MODEM_DEV)))