[paparazzi-commits] [5964] add firmwares/[fixedwing|rotorcraft] to include dirs

[Felix Ruess]

Revision: 5964
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5964
Author:   flixr
Date:     2010-09-27 22:55:01 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
add firmwares/[fixedwing|rotorcraft] to include dirs

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/fixedwing.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

Modified: paparazzi3/trunk/conf/autopilot/fixedwing.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing.makefile  2010-09-27 22:54:54 UTC 
(rev 5963)
+++ paparazzi3/trunk/conf/autopilot/fixedwing.makefile  2010-09-27 22:55:01 UTC 
(rev 5964)
@@ -13,10 +13,12 @@
 SRC_ARCH=$(SRC_FIXEDWING)/arch/$(ARCH)
 SRC_FIXEDWING_TEST=$(SRC_FIXEDWING)/
 
-FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)
+SRC_FIRMWARE=firmwares/fixedwing
 
+FIXEDWING_INC = -I$(SRC_FIRMWARE) -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)
 
 
+
 # Standard Fixed Wing Code
 include $(CFG_FIXEDWING)/autopilot.makefile
 

Modified: paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile      
2010-09-27 22:54:54 UTC (rev 5963)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile      
2010-09-27 22:55:01 UTC (rev 5964)
@@ -11,6 +11,8 @@
 SRC_BOOZ=booz
 SRC_BOOZ_SIM = $(SRC_BOOZ)/arch/sim
 
+SRC_FIRMWARE=firmwares/rotorcraft
+
 SRC_BOARD=boards/$(BOARD)
 
 NPSDIR = $(SIMDIR)/nps
@@ -24,7 +26,7 @@
 sim.CFLAGS  += -I$(NPSDIR) -I/usr/local/include -I$(JSBSIM_INC)
 sim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim
 
-sim.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_SIM) -I$(SRC_BOARD) -I../simulator 
-I$(PAPARAZZI_HOME)/conf/simulator/nps
+sim.CFLAGS  += -I$(SRC_FIRMWARE) -I$(SRC_BOOZ) -I$(SRC_BOOZ_SIM) 
-I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps
 
 sim.srcs = $(NPSDIR)/nps_main.c                      \
           $(NPSDIR)/nps_fdm_jsbsim.c                \