[paparazzi-commits] [6140] for fdm_nps subsystem: use jsbsim package if available, otherwise look for jsbsim in /opt/jsbsim

[Felix Ruess]

Revision: 6140
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6140
Author:   flixr
Date:     2010-10-11 15:37:16 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
for fdm_nps subsystem: use jsbsim package if available, otherwise look for 
jsbsim in /opt/jsbsim

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

Modified: paparazzi3/trunk/conf/Makefile.sim
===================================================================
--- paparazzi3/trunk/conf/Makefile.sim  2010-10-11 12:48:48 UTC (rev 6139)
+++ paparazzi3/trunk/conf/Makefile.sim  2010-10-11 15:37:16 UTC (rev 6140)
@@ -82,8 +82,19 @@
 $(TARGET).objso        = $($(TARGET).srcs:%.c=$(OBJDIR)/%.o)
 $(TARGET).objs = $($(TARGET).objso:%.S=$(OBJDIR)/%.o)
 
+ifeq ($(SIM_TYPE),JSBSIM)
+all compile: check_jsbsim $(OBJDIR)/simsitl
+else
 all compile: $(OBJDIR)/simsitl
+endif
 
+check_jsbsim:
+       @echo Paparazzi jsbsim package found: $(JSBSIM_PKG)
+#      @if `pkg-config JSBSim --exists`; then       \
+#              echo "Using paparazzi JSBSim package.";     \
+#      else    \
+#              echo "Looking for JSBSim under /opt/jsbsim/"; \
+#      fi
 
 
 ifeq ($(SIM_TYPE),BOOZ)

Modified: paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile      
2010-10-11 12:48:48 UTC (rev 6139)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile      
2010-10-11 15:37:16 UTC (rev 6140)
@@ -23,11 +23,20 @@
 sim.CFLAGS  += -DSITL
 sim.CFLAGS  += `pkg-config glib-2.0 --cflags` -I /usr/include/meschach
 sim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lmeschach -lpcre -lglibivy
-sim.CFLAGS  += -I$(NPSDIR) -I/usr/local/include -I$(JSBSIM_INC)
-sim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim
+sim.CFLAGS  += -I$(NPSDIR) -I$(SRC_FIRMWARE) -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
+# use the paparazzi-jsbsim package if it is installed, otherwise look for 
JSBsim under /opt/jsbsim
+JSBSIM_PKG = $(shell pkg-config JSBSim --exists && echo 'yes')
+ifeq ($(JSBSIM_PKG), yes)
+       sim.CFLAGS  += `pkg-config JSBSim --cflags`
+       sim.LDFLAGS += `pkg-config JSBSim --libs`
+else
+       JSBSIM_PKG = no
+       sim.CFLAGS  += -I/usr/local/include -I$(JSBSIM_INC)
+       sim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim
+endif
 
+
 sim.srcs = $(NPSDIR)/nps_main.c                      \
        $(NPSDIR)/nps_fdm_jsbsim.c                \
        $(NPSDIR)/nps_random.c                    \