[paparazzi-commits] [6417] Find ocaml library paths with ocamlfind and compile C with fPIC flag on 64 bit OS

[Eric]

Revision: 6417
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6417
Author:   lamestllama
Date:     2010-11-19 06:28:14 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
Find ocaml library paths with ocamlfind and compile C with fPIC flag on 64 bit 
OS

Modified Paths:
--------------
    paparazzi-software/trunk/sw/simulator/Makefile

Modified: paparazzi-software/trunk/sw/simulator/Makefile
===================================================================
--- paparazzi-software/trunk/sw/simulator/Makefile      2010-11-19 06:06:08 UTC 
(rev 6416)
+++ paparazzi-software/trunk/sw/simulator/Makefile      2010-11-19 06:28:14 UTC 
(rev 6417)
@@ -23,6 +23,13 @@
 # Quiet compilation
 Q=@
 
+LBITS := $(shell getconf LONG_BIT)
+ifeq ($(LBITS),64)
+  FPIC = -ccopt -fPIC   
+else
+  FPIC =
+endif
+
 include ../../conf/Makefile.local
 
 SIMML = stdlib.ml data.ml flightModel.ml gps.ml
@@ -35,7 +42,7 @@
 
 OCAMLC = ocamlc -g
 OCAMLOPT=ocamlopt
-INCLUDES= -I +lablgtk2 -I ../lib/ocaml -I +xml-light
+INCLUDES= $(shell ocamlfind query -r -i-format lablgtk2) -I ../lib/ocaml 
$(shell ocamlfind query -r -i-format xml-light)
 
 AIRBORNE = ../airborne
 VARINCLUDE=$(PAPARAZZI_HOME)/var/include
@@ -70,7 +77,7 @@
 
 %.o : %.c
        @echo OC $<
-       $(Q)$(OCAMLC) -c $<
+       $(Q)$(OCAMLC) $(FPIC) -c $<
 
 %.cmx : %.ml
        @echo OOC $<