[joystick] fix sdl linker flags for the ocaml input2ivy

paparazzi · Jun 25, 2012 · aed31e3 · aed31e3
1 parent 1a50d42
commit aed31e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sw/ground_segment/joystick/Makefile b/sw/ground_segment/joystick/Makefile
@@ -29,7 +29,7 @@ OCAMLLIB = ../../lib/ocaml
 TOOLSDIR = ../../tools
 OCAMLINCLUDES= -I $(OCAMLLIB) $(shell ocamlfind query -r -i-format lablgtk2) $(shell ocamlfind query -r -i-format xml-light) -I $(TOOLSDIR)
 LIBPPRZCMA=$(OCAMLLIB)/lib-pprz.cma
-SDLLIB= -L/$(shell sdl-config --prefix)/lib
+ML_SDL_LFLAGS = $(foreach u,$(shell sdl-config --libs),-cclib $(u))
 INCLUDES += -I `ocamlc -where`
 
 all: test_stick input2ivy
@@ -38,8 +38,8 @@ test_stick: test_sdl_stick.o
 	gcc -g -O2 -Wall -DSTICK_DBG `pkg-config glib-2.0 --cflags` -o $@ $^ sdl_stick.c `pkg-config glib-2.0 --libs` -lglibivy `sdl-config --libs`
 
 input2ivy: sdl_stick.o ml_sdl_stick.o input2ivy.cmo
-	$(OCAMLC) $(OCAMLINCLUDES) -custom -cclib $(SDLLIB) -cclib -lSDL -o $@ unix.cma str.cma glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma $(TOOLSDIR)/fp_proc.cmo $^
-        
+	$(OCAMLC) $(OCAMLINCLUDES) -o $@ unix.cma str.cma glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma $(TOOLSDIR)/fp_proc.cmo $^ -custom $(ML_SDL_LFLAGS)
+
 %.o : %.c
 	gcc -c -O2 -Wall `pkg-config glib-2.0 --cflags` $(INCLUDES) $<