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

tell emacs about makefiles and little cleanup

Browse Source
This commit is contained in:
Felix Ruess
2010-09-21 22:49:33 +00:00
parent d5049ff09f
commit df2c7308ab
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2
View File
@@ -1,3 +1,5 @@
# Hey Emacs, this is a -*- makefile -*-
#
# Paparazzi main $Id$ # Paparazzi main $Id$
# Copyright (C) 2004 Pascal Brisset Antoine Drouin # Copyright (C) 2004 Pascal Brisset Antoine Drouin
# #
conf/autopilot/fixedwing.makefile
+1
View File
@@ -1,3 +1,4 @@
# Hey Emacs, this is a -*- makefile -*-
# #
# fixedwing.makefile # fixedwing.makefile
# #
conf/autopilot/rotorcraft.makefile
+4 -5
View File
@@ -1,3 +1,4 @@
# Hey Emacs, this is a -*- makefile -*-
# #
# $Id$ # $Id$
# #
@@ -91,8 +92,8 @@ ap.srcs += $(SRC_ARCH)/uart_hw.c
ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport
ap.CFLAGS += -DDOWNLINK_DEVICE=$(MODEM_PORT) ap.CFLAGS += -DDOWNLINK_DEVICE=$(MODEM_PORT)
ap.srcs += $(SRC_BOOZ)/booz2_telemetry.c \ ap.srcs += $(SRC_BOOZ)/booz2_telemetry.c \
downlink.c \ downlink.c \
pprz_transport.c pprz_transport.c
ap.CFLAGS += -DDATALINK=PPRZ ap.CFLAGS += -DDATALINK=PPRZ
ap.CFLAGS += -DPPRZ_UART=$(MODEM_PORT) ap.CFLAGS += -DPPRZ_UART=$(MODEM_PORT)
ap.srcs += $(SRC_BOOZ)/booz2_datalink.c ap.srcs += $(SRC_BOOZ)/booz2_datalink.c
@@ -152,7 +153,7 @@ ap.srcs += $(SRC_BOOZ)/booz2_battery.c
ap.CFLAGS += -DADC0_VIC_SLOT=2 ap.CFLAGS += -DADC0_VIC_SLOT=2
ap.CFLAGS += -DADC1_VIC_SLOT=3 ap.CFLAGS += -DADC1_VIC_SLOT=3
ap.srcs += $(SRC_BOOZ)/booz2_analog.c \ ap.srcs += $(SRC_BOOZ)/booz2_analog.c \
$(SRC_BOOZ_ARCH)/booz2_analog_hw.c $(SRC_BOOZ_ARCH)/booz2_analog_hw.c
else ifeq ($(ARCHI), stm32) else ifeq ($(ARCHI), stm32)
ap.srcs += lisa/lisa_analog_plug.c ap.srcs += lisa/lisa_analog_plug.c
endif endif
@@ -221,5 +222,3 @@ ap.srcs += $(SRC_BOOZ)/booz2_navigation.c
# or # or
# nothing # nothing
# #
sw/airborne/Makefile
+2 -5
View File
@@ -1,3 +1,4 @@
# Hey Emacs, this is a -*- makefile -*-
# #
# $Id$ # $Id$
# Copyright (C) 2003-2005 Pascal Brisset, Antoine Drouin # Copyright (C) 2003-2005 Pascal Brisset, Antoine Drouin
@@ -25,11 +26,7 @@ OBJDIR = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/$(TARGET)
VARINCLUDE=$(PAPARAZZI_HOME)/var/include VARINCLUDE=$(PAPARAZZI_HOME)/var/include
ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT) ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
# INCLUDES = -I $(PAPARAZZI_SRC)/sw/include -I $(PAPARAZZI_SRC)/sw/airborne -I $(PAPARAZZI_SRC)/conf/autopilot -I $(PAPARAZZI_SRC)/sw/airborne/$($(TARGET).ARCHDIR) -I $(VARINCLUDE) -I $(ACINCLUDE)
# WTF is that for ? VARINCLUDE=$(PAPARAZZI_HOME)/var/include and -I $(PAPARAZZI_SRC)/var/include in the line below ?
#
INCLUDES = -I $(PAPARAZZI_SRC)/sw/include -I $(PAPARAZZI_SRC)/var/include -I $(PAPARAZZI_SRC)/sw/airborne -I $(PAPARAZZI_SRC)/conf/autopilot -I $(PAPARAZZI_SRC)/sw/airborne/$($(TARGET).ARCHDIR) -I $(VARINCLUDE) -I $(ACINCLUDE)
SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/$(ARCHDIR) SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/$(ARCHDIR)