diff --git a/alliance/src/b2f/src/Makefile.am b/alliance/src/b2f/src/Makefile.am
index cd0d24ff..e30e4a4c 100644
--- a/alliance/src/b2f/src/Makefile.am
+++ b/alliance/src/b2f/src/Makefile.am
@@ -2,8 +2,10 @@
 
 bin_PROGRAMS = b2f
 
+CFLAGS = @CFLAGS@ -DB2F_VERSION=\"@B2F_VERSION@\"
+
 b2f_LDADD = @LIBS@ \
-          -lAbv -lAbe -lAbt -lFtl -lFks -lFvh -lFsm \
+          -lAbt -lAbv -lAbe -lFtl -lFks -lFvh -lFsm \
 	  -lBtr -lBdd -lAbl -lAut -lMut
 
 b2f_SOURCES = \
diff --git a/alliance/src/boom/src/Makefile.am b/alliance/src/boom/src/Makefile.am
index c06d89de..9e134cc3 100644
--- a/alliance/src/boom/src/Makefile.am
+++ b/alliance/src/boom/src/Makefile.am
@@ -2,8 +2,10 @@
 
 bin_PROGRAMS = boom
 
+CFLAGS = @CFLAGS@ -DBOOM_VERSION=\"@BOOM_VERSION@\"
+
 boom_LDADD = @LIBS@ \
-          -lAbv -lAbe -lAbt -lBdd -lAbl -lAut -lMut
+          -lAbv -lAbe -lAbt -lBdd -lAbl -lAut -lMut -lm
 
 boom_SOURCES = \
 boom_abl.c        boom_cost.h       boom_main.c       boom_procrast.h \
@@ -19,5 +21,5 @@ boom_bdd.h        boom_gradient.c   boom_param.h      boom_top.c \
 boom_burgun.c     boom_gradient.h   boom_parse.c      boom_top.h \
 boom_burgun.h     boom_hash.c       boom_parse.h      boom_window.c \
 boom_check.c      boom_hash.h       boom_post.c       boom_window.h \
-boom_check.h      boom_logic.c      boom_post.h \
-boom_cost.c       boom_logic.h      boom_procrast.c
+boom_check.h      boom_post.h \
+boom_cost.c       boom_procrast.c
diff --git a/alliance/src/configure.in b/alliance/src/configure.in
index 1cc6ad1f..22a09fd9 100644
--- a/alliance/src/configure.in
+++ b/alliance/src/configure.in
@@ -25,7 +25,7 @@ dnl           Almost ten years since I wrote this stuff, I just can't
 dnl           believe it
 dnl Date    : 01/02/2002
 dnl Author  : Frederic Petrot <Frederic.Petrot@lip6.fr>
-dnl $Id: configure.in,v 1.12 2002/03/22 09:52:01 francois Exp $
+dnl $Id: configure.in,v 1.13 2002/03/29 17:49:46 ludo Exp $
 dnl
 dnl
 AC_INIT(./configure.in)
@@ -38,7 +38,7 @@ changequote(,)dnl
 # compiled and installed prior to the tools
 # Add in the following variable the library name (or part of it, as a
 # match is performed) that you what to compile prior to anything
-libraries="\<mbk aut \<rds abl bdd btr vex abe abt abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn vpd vvh vtl"
+libraries="\<mbk aut \<rds abl bdd btr vex abe abt abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn vpd vvh vtl pat ppt phl gcp druc"
 dirs=`\ls -l $srcdir | grep '^d' | awk '{print $NF}'`
 for l in $libraries ; do
    for i in $dirs ; do
diff --git a/alliance/src/fmi/src/Makefile.am b/alliance/src/fmi/src/Makefile.am
index 42516182..c491f517 100644
--- a/alliance/src/fmi/src/Makefile.am
+++ b/alliance/src/fmi/src/Makefile.am
@@ -2,11 +2,12 @@
 
 bin_PROGRAMS = fmi
 
+CFLAGS = @CFLAGS@ -DFMI_VERSION=\"@FMI_VERSION@\"
+
 fmi_LDADD = @LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
 
-
 fmi_SOURCES = \
-fmi_bdd.c     fmi_main.c    fmi_optim.c   fmi_parse.c   fsa_bdd.c \
+fmi_bdd.c     fmi_main.c    fmi_optim.c   fmi_parse.c   \
 fmi_bdd.h     fmi_main.h    fmi_optim.h   fmi_parse.h
diff --git a/alliance/src/fsp/src/Makefile.am b/alliance/src/fsp/src/Makefile.am
index ffd23bb7..e6d11175 100644
--- a/alliance/src/fsp/src/Makefile.am
+++ b/alliance/src/fsp/src/Makefile.am
@@ -2,6 +2,8 @@
 
 bin_PROGRAMS = fsp
 
+CFLAGS = @CFLAGS@ -DFSP_VERSION=\"@FSP_VERSION@\"
+
 fsp_LDADD = @LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
diff --git a/alliance/src/fvh/src/Makefile.am b/alliance/src/fvh/src/Makefile.am
index 65cb3c2b..b5337073 100644
--- a/alliance/src/fvh/src/Makefile.am
+++ b/alliance/src/fvh/src/Makefile.am
@@ -1,10 +1,12 @@
 lib_LIBRARIES       = libFvh.a
+include_HEADERS     = fvh.h
 libFvh_a_SOURCES    = fbl_bcomp_y.y fbl_bcomp_l.l \
-fbh_add.c  fbh_rmv.c	fbl_blex.h   fbl_drive.h  fvh.h       fvhfbh2fsm.c \
-fbh_del.c  fbh_typ.c	fbl_bspec.c  fbl_utdef.h  fvhdrive.c  fvhfbh2fsm.h \
-fbh_env.c  fbh_uti.c	fbl_bspec.h  fbl_util.c   fvhdrive.h  fvhparse.c \
-fbh_fre.c  fbh_view.c	fbl_byacc.h  fbl_util.h   fvherror.c  fvhparse.h \
-fbh_rin.c  fbl_bedef.h	fbl_drive.c  fbl_utype.h  fvherror.h
+fbh_add.c fbh_del.c fbh_env.c fbh_fre.c fbh_rin.c fbh_rmv.c \
+fbh_typ.c fbh_uti.c fbh_view.c \
+fbl_bedef.h fbl_blex.h fbl_bspec.c fbl_bspec.h fbl_byacc.h \
+fbl_drive.c fbl_drive.h fbl_utdef.h fbl_util.c fbl_util.h \
+fbl_utype.h fvhdrive.c fvhdrive.h fvherror.c fvherror.h \
+fvhfbh2fsm.c fvhfbh2fsm.h fvh.h fvhparse.c fvhparse.h
 
 CLEANFILES          = fbl_bcomp_y.c fbl_bcomp_y.h fbl_bcomp_l.c
 
diff --git a/alliance/src/k2f/src/Makefile.am b/alliance/src/k2f/src/Makefile.am
index 8c204abf..ef75b1ce 100644
--- a/alliance/src/k2f/src/Makefile.am
+++ b/alliance/src/k2f/src/Makefile.am
@@ -2,6 +2,8 @@
 
 bin_PROGRAMS = k2f
 
+CFLAGS = @CFLAGS@ -DK2F_VERSION=\"@K2F_VERSION@\"
+
 k2f_LDADD = @LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
diff --git a/alliance/src/ocr/src/Makefile.am b/alliance/src/ocr/src/Makefile.am
index b46aacdd..a374cf3f 100644
--- a/alliance/src/ocr/src/Makefile.am
+++ b/alliance/src/ocr/src/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = seg util rout include 
+SUBDIRS = seg util rout
diff --git a/alliance/src/syf/src/Makefile.am b/alliance/src/syf/src/Makefile.am
index 431d944d..8dd41f45 100644
--- a/alliance/src/syf/src/Makefile.am
+++ b/alliance/src/syf/src/Makefile.am
@@ -2,6 +2,8 @@
 
 bin_PROGRAMS = syf
 
+CFLAGS = @CFLAGS@ -DSYF_VERSION=\"@SYF_VERSION@\"
+
 syf_LDADD = @LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
diff --git a/alliance/src/vasy/src/Makefile.am b/alliance/src/vasy/src/Makefile.am
index f8efacf2..2215e34b 100644
--- a/alliance/src/vasy/src/Makefile.am
+++ b/alliance/src/vasy/src/Makefile.am
@@ -2,6 +2,8 @@
 
 bin_PROGRAMS = vasy
 
+CFLAGS = @CFLAGS@ -DVASY_VERSION=\"@VASY_VERSION@\"
+
 vasy_LDADD = @LIBS@ \
           -lRtd -lRtn -lVtl -lVvh -lVpd -lVpn -lVbl -lVbh \
 	  -lVex -lBdd -lAbl -lAut -lMut