[paparazzi-commits] [5892] update makefile to use jsbsim from package installed under /usr

[Felix Ruess]

Revision: 5892
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5892
Author:   flixr
Date:     2010-09-16 20:30:57 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
update makefile to use jsbsim from package installed under /usr

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

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile     
2010-09-16 20:30:50 UTC (rev 5891)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile     
2010-09-16 20:30:57 UTC (rev 5892)
@@ -173,9 +173,8 @@
 ## JSBSIM THREAD SPECIFIC
 ##
 
-JSBSIM_ROOT = /opt/jsbsim
-JSBSIM_INC = $(JSBSIM_ROOT)/include/JSBSim
-JSBSIM_LIB = $(JSBSIM_ROOT)/lib
+JSBSIM_INC = /usr/include/JSBSim
+#JSBSIM_LIB = /usr/lib
 
 jsbsim.CFLAGS          += $(fbw_CFLAGS) $(ap_CFLAGS)
 jsbsim.srcs            += $(fbw_srcs) $(ap_srcs)
@@ -185,7 +184,7 @@
 
 # external libraries
 jsbsim.CFLAGS          += -I$(SIMDIR) -I/usr/include -I$(JSBSIM_INC) 
`pkg-config glib-2.0 --cflags`
-jsbsim.LDFLAGS         += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy 
-L/usr/lib -L$(JSBSIM_LIB) -lJSBSim
+jsbsim.LDFLAGS         += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy 
-L/usr/lib -lJSBSim
 
 jsbsim.CFLAGS          += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport
 jsbsim.srcs            += downlink.c datalink.c $(SRC_ARCH)/jsbsim_hw.c 
$(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/jsbsim_transport.c