diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile
index 76cd97c91c..23e70557a0 100644
--- a/sw/ground_segment/cockpit/Makefile
+++ b/sw/ground_segment/cockpit/Makefile
@@ -96,7 +96,7 @@ clean:
 
 CC = gcc
 CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` $(FPIC)
-LDFLAGS=`pkg-config gtk+-2.0 --libs` -s `pcre-config --libs` -lglibivy
+LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy
 
 
 ant_track : ant_track.c
diff --git a/sw/ground_segment/joystick/Makefile b/sw/ground_segment/joystick/Makefile
index 7c56f9f226..54c8459665 100644
--- a/sw/ground_segment/joystick/Makefile
+++ b/sw/ground_segment/joystick/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 #   $Id$
 #   Copyright (C) 2004 Pascal Brisset, Antoine Drouin
 #
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 # Quiet compilation
 Q=@
@@ -32,7 +32,7 @@ LIBPPRZCMA=$(OCAMLLIB)/lib-pprz.cma
 all: test_stick input2ivy
 
 test_stick: test_stick.o
-	gcc -g -O2 -Wall -DSTICK_DBG `pkg-config glib-2.0 --cflags` -o $@ $^ usb_stick.c `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O2 -Wall -DSTICK_DBG `pkg-config glib-2.0 --cflags` -o $@ $^ usb_stick.c `pkg-config glib-2.0 --libs` -lglibivy
 
 input2ivy: usb_stick.o ml_usb_stick.o input2ivy.cmo
 	$(OCAMLC) $(OCAMLINCLUDES) -custom -o $@ unix.cma str.cma glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma $(TOOLSDIR)/fp_proc.cmo $^
@@ -47,4 +47,3 @@ input2ivy: usb_stick.o ml_usb_stick.o input2ivy.cmo
 
 clean:
 	rm -f *~ core *.o *.bak .depend test_stick *.cmo *.cmi input2ivy
-
diff --git a/sw/ground_segment/tmtc/GSM/Makefile b/sw/ground_segment/tmtc/GSM/Makefile
index 24b1c40996..e731282280 100644
--- a/sw/ground_segment/tmtc/GSM/Makefile
+++ b/sw/ground_segment/tmtc/GSM/Makefile
@@ -1,7 +1,7 @@
 all: SMS_GS
 
 SMS_GS: SMS_Ground_UDtest_final.c
-	gcc -g -O2 -Wall `pkg-config --cflags glib-2.0 gtk+-2.0` -L/usr/lib -lglibivy -o SMS_GS SMS_Ground_UDtest_final.c `pkg-config --libs glib-2.0 gtk+-2.0` `pcre-config --libs` -lglibivy 
+	gcc -g -O2 -Wall `pkg-config --cflags glib-2.0 gtk+-2.0` -L/usr/lib -lglibivy -o SMS_GS SMS_Ground_UDtest_final.c `pkg-config --libs glib-2.0 gtk+-2.0` -lglibivy
 
 clean:
 	rm SMS_GS
diff --git a/sw/in_progress/button/Makefile b/sw/in_progress/button/Makefile
index 73b93e66ae..f2f0bcb54e 100644
--- a/sw/in_progress/button/Makefile
+++ b/sw/in_progress/button/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 #   $Id: Makefile 5874 2010-09-15 03:41:04Z aibara $
 #   Copyright (C) 2004 Pascal Brisset, Antoine Drouin
 #
@@ -17,15 +17,15 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 # Quiet compilation
 Q=@
 
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt
-INCLUDES= $(shell ocamlfind query -r -i-format xml-light)  $(shell ocamlfind query -r -i-format lablgtk2) -I ../../lib/ocaml 
+INCLUDES= $(shell ocamlfind query -r -i-format xml-light)  $(shell ocamlfind query -r -i-format lablgtk2) -I ../../lib/ocaml
 
 all: panic
 
@@ -63,10 +63,10 @@ pt : ahrsview imuview ahrs2fg
 
 CC = gcc
 CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags`
-LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox `pcre-config --libs` -lglibivy
+LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox -lglibivy
+
+MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic  /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL  -Wl,--rpath -Wl,/usr/local/lib -lglibivy `pcre-config --libs`
 
-MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic  /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL  -Wl,--rpath -Wl,/usr/local/lib `pcre-config --libs` -lglibivy
- 
 MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1  -I. -I.  -I..    -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
 
 clean:
@@ -99,7 +99,7 @@ FGFS_ARGS = $(FGFS_COMMON_ARGS) $(FGFS_IN_GUI_ARGS)
 #FGFS_GAME_ARGS)
 
 panic: panic.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy -lhid
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lhid
 
 #
 # Dependencies
@@ -108,6 +108,6 @@ panic: panic.c
 .depend: Makefile
 	ocamldep -I ../../lib/ocaml *.ml* > .depend
 
-ifneq ($(MAKECMDGOALS),clean) 
+ifneq ($(MAKECMDGOALS),clean)
 -include .depend
 endif
diff --git a/sw/in_progress/fdm/Makefile b/sw/in_progress/fdm/Makefile
index 0d620ca127..1589709003 100644
--- a/sw/in_progress/fdm/Makefile
+++ b/sw/in_progress/fdm/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 #   $Id$
 #   Copyright (C) 2004 Pascal Brisset, Antoine Drouin
 #
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 # Quiet compilation
 Q=@
@@ -26,14 +26,13 @@ Q=@
 all: fdm_step
 
 fdm_step: fdm_step.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
 
 
 fms_steps_attitude: fms_steps_attitude.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
 
 
 
 clean:
 	rm -f *~ core *.o *.bak .depend fdm_step fms_steps_attitude
-
diff --git a/sw/in_progress/ir_calibration/Makefile b/sw/in_progress/ir_calibration/Makefile
index 47a072344d..6924422e1d 100644
--- a/sw/in_progress/ir_calibration/Makefile
+++ b/sw/in_progress/ir_calibration/Makefile
@@ -2,10 +2,10 @@
 
 CC = gcc
 CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags`
-LDFLAGS=`pkg-config gtk+-2.0 --libs` `pcre-config --libs` -lglibivy -lm -lgtkdatabox
+LDFLAGS=`pkg-config gtk+-2.0 --libs` -lglibivy -lm -lgtkdatabox
 
 ir_calib : main.c calibrator.c gui.c
 	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
 
 clean:
-	rm -f *~ ir_calib
\ No newline at end of file
+	rm -f *~ ir_calib
diff --git a/sw/in_progress/motor_bench/Makefile b/sw/in_progress/motor_bench/Makefile
index 034cafc970..4e8f6bbd82 100644
--- a/sw/in_progress/motor_bench/Makefile
+++ b/sw/in_progress/motor_bench/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -I ../../../var/MB
-LDFLAGS=`pkg-config gtk+-2.0 --libs` -s `pcre-config --libs` -lglibivy
+LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy
 
 
 motor_bench : main.c
diff --git a/sw/lib/ocaml/Makefile b/sw/lib/ocaml/Makefile
index 24a8a92e10..8a1eb2bbdf 100644
--- a/sw/lib/ocaml/Makefile
+++ b/sw/lib/ocaml/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 #   $Id$
 #   Copyright (C) 2003 Pascal Brisset, Antoine Drouin
 #
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
+# Boston, MA 02111-1307, USA.
 #
 
 
@@ -25,7 +25,7 @@ Q=@
 
 LBITS := $(shell getconf LONG_BIT)
 ifeq ($(LBITS),64)
-  FPIC = -ccopt -fPIC   
+  FPIC = -ccopt -fPIC
 else
   FPIC =
 endif
@@ -164,6 +164,6 @@ clean :
 .depend: Makefile
 	ocamldep *.ml* > .depend
 
-ifneq ($(MAKECMDGOALS),clean) 
+ifneq ($(MAKECMDGOALS),clean)
 -include .depend
 endif
diff --git a/sw/lib/ocaml/ivy/Makefile b/sw/lib/ocaml/ivy/Makefile
index 34bb76568d..abacbdf640 100644
--- a/sw/lib/ocaml/ivy/Makefile
+++ b/sw/lib/ocaml/ivy/Makefile
@@ -63,7 +63,7 @@ deb :
 	cp debian/changelog.$(DISTRO) debian/changelog
 	dpkg-buildpackage -rfakeroot
 
-ivy : ivy-ocaml.cma ivy-ocaml.cmxa 
+ivy : ivy-ocaml.cma ivy-ocaml.cmxa
 glibivy : glibivy-ocaml.cma glibivy-ocaml.cmxa
 tkivy : tkivy-ocaml.cma tkivy-ocaml.cmxa
 
@@ -101,7 +101,7 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
 .ml.cmo :
 	$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
 .c.o :
-    
+
 	$(CC) -Wall -c $(FPIC) -I /opt/local/include/  $(OCAMLINC) $(GLIBINC) $<
 .mli.cmi :
 	$(OCAMLMLI) $(OCAMLFLAGS) -c $<
diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile
index 01dd11580b..71d397db08 100644
--- a/sw/logalizer/Makefile
+++ b/sw/logalizer/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 #   $Id$
 #   Copyright (C) 2004 Pascal Brisset, Antoine Drouin
 #
@@ -17,15 +17,15 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 # Quiet compilation
 Q=@
 
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt
-INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../lib/ocaml 
+INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../lib/ocaml
 
 all: play plotter plot sd2log plotprofile
 
@@ -81,7 +81,7 @@ pt : ahrsview imuview ahrs2fg
 
 CC = gcc
 CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags`
-LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox `pcre-config --libs` -lglibivy
+LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox -lglibivy
 
 motor_bench : motor_bench.c sliding_plot.c
 	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
@@ -98,15 +98,15 @@ plot_roll_loop : plot_roll_loop.c sliding_plot.c
 test_sliding_plot: test_sliding_plot.c sliding_plot.c
 	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
 
-MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic  /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL  -Wl,--rpath -Wl,/usr/local/lib `pcre-config --libs` -lglibivy
- 
+MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic  /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL  -Wl,--rpath -Wl,/usr/local/lib -lglibivy `pcre-config --libs`
+
 MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1  -I. -I.  -I..    -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
 
 disp3d: disp3d.c
 	$(CC) $(MORE_CFLAGS) -g -o $@ $^ $(MORE_FLAGS)
 
 plotprofile: plotprofile.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
 
 test1: test1.c
 	$(CC) $(MORE_CFLAGS) -g -o $@ $^ $(MORE_FLAGS) -lglut
@@ -146,23 +146,23 @@ FGFS_ARGS = $(FGFS_COMMON_ARGS) $(FGFS_IN_GUI_ARGS)
 run_fg:
 	$(FGFS_ENV) $(FGFS) $(FGFS_ARGS)
 
-ahrs2fg: ahrs2fg.c network.c flight_gear.c utils.c 
+ahrs2fg: ahrs2fg.c network.c flight_gear.c utils.c
 	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
 
 test_samere: test_samere.c network.c flight_gear.c utils.c
 	$(CC) $(CFLAGS) -I../airborne -I../airborne/test -I../include -g -o $@ $^ $(LDFLAGS)
 
 ivy_example: ivy_example.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
 
 tmclient: tmclient.c
-	gcc -g -O1 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O1 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
 
 ffjoystick: ffjoystick.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy -lm
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm
 
 ctrlstick: ctrlstick.c
-	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs`  `pcre-config --libs` -lglibivy
+	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
 
 #
 # Dependencies
@@ -171,6 +171,6 @@ ctrlstick: ctrlstick.c
 .depend: Makefile
 	ocamldep -I ../lib/ocaml *.ml* > .depend
 
-ifneq ($(MAKECMDGOALS),clean) 
+ifneq ($(MAKECMDGOALS),clean)
 -include .depend
 endif