--- Makefile	2009-12-03 16:23:31.000000000 +0100
+++ m	2009-03-09 15:24:56.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: Makefile 4292 2009-10-20 11:24:18Z hecto $
+# $Id: Makefile,v 1.29 2008/08/31 15:20:20 hecto Exp $
 #  
 # Copyright (C) 2003-2006  Pascal Brisset, Antoine Drouin
 #
@@ -30,7 +30,7 @@ OCAMLNETCMA=$(shell ocamlfind query -r -
 OCAMLLEX=ocamllex
 OCAMLYACC=ocamlyacc
 
-all: gen_aircraft.out gen_airframe.out gen_messages.out gen_ubx.out gen_flight_plan.out gen_radio.out gen_periodic.out gen_settings.out gen_tuning.out gen_xsens.out gen_modules.out gen_conf_radio_control_ppm.out
+all: gen_aircraft.out gen_airframe.out gen_messages.out gen_ubx.out gen_flight_plan.out gen_radio.out extract_makefile.out gen_periodic.out gen_settings.out gen_tuning.out gen_xsens.out merge_messages.out
 
 FP_CMO = fp_syntax.cmo fp_parser.cmo fp_lexer.cmo fp_proc.cmo gen_flight_plan.cmo
 ABS_FP = $(FP_CMO:%=$$PAPARAZZI_SRC/sw/tools/%)
@@ -40,7 +40,6 @@ gen_flight_plan.out : $(FP_CMO) ../lib/o
 	$(Q)$(OCAMLC) $(INCLUDES) -custom -o $@ unix.cma str.cma xml-light.cma ivy-ocaml.cma lib-pprz.cma $^
 
 fp_parser.cmo : fp_parser.cmi fp_syntax.cmi
-fp_proc.cmo : fp_lexer.cmi fp_parser.cmi fp_proc.cmi
 fp_parser.cmi : fp_parser.ml fp_syntax.cmi
 fp_lexer.cmi : fp_syntax.cmi
 fp_lexer.cmo : fp_lexer.cmi