diff --git a/alliance/src/abe/src/Makefile.am b/alliance/src/abe/src/Makefile.am
index cd64454f..25f5a9f4 100644
--- a/alliance/src/abe/src/Makefile.am
+++ b/alliance/src/abe/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libAbe.a
 include_HEADERS     = abe.h
 libAbe_a_SOURCES    = \
diff --git a/alliance/src/abl/src/Makefile.am b/alliance/src/abl/src/Makefile.am
index 413162d8..98f957fc 100644
--- a/alliance/src/abl/src/Makefile.am
+++ b/alliance/src/abl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libAbl.a
 include_HEADERS     = abl.h
 libAbl_a_SOURCES    = abldel.h       ablflat.h      abloptim.h     ablunflat.h \
diff --git a/alliance/src/abt/src/Makefile.am b/alliance/src/abt/src/Makefile.am
index 8508ac13..16dde960 100644
--- a/alliance/src/abt/src/Makefile.am
+++ b/alliance/src/abt/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libAbt.a
 include_HEADERS     = abt.h
 libAbt_a_SOURCES    = \
diff --git a/alliance/src/abv/src/Makefile.am b/alliance/src/abv/src/Makefile.am
index 017f9046..8d9f41d3 100644
--- a/alliance/src/abv/src/Makefile.am
+++ b/alliance/src/abv/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libAbv.a
 include_HEADERS     = abv.h
 libAbv_a_SOURCES    = bvl_bcomp_y.y bvl_bcomp_l.l \
diff --git a/alliance/src/alcban/src/Makefile.am b/alliance/src/alcban/src/Makefile.am
index 1c170670..0f658567 100644
--- a/alliance/src/alcban/src/Makefile.am
+++ b/alliance/src/alcban/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = alcbanner
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DALLIANCE_VERSION=\"@ALLIANCE_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 alcbanner_LDADD = @ALLIANCE_LIBS@ \
           -lMut
diff --git a/alliance/src/alliance.m4 b/alliance/src/alliance.m4
index 30c32b97..45b2c5d0 100644
--- a/alliance/src/alliance.m4
+++ b/alliance/src/alliance.m4
@@ -39,7 +39,7 @@ LIBS="$ac_save_LIBS"
     AC_MSG_RESULT(no)
     AC_MSG_ERROR(Please install alliance
     or verify your ALLIANCE_TOP variable
-    or use configure with the --with-alliance-prefix option)
+    or use configure with the --with-alliance-top option)
    ALLIANCE_CFLAGS=""
    ALLIANCE_LIBS=""
 dnl ifelse([$2], , :, [$2])
diff --git a/alliance/src/asimut/src/Makefile.am b/alliance/src/asimut/src/Makefile.am
index b2e6e173..824ec143 100644
--- a/alliance/src/asimut/src/Makefile.am
+++ b/alliance/src/asimut/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 lib_LIBRARIES       = libCst.a libSch.a
 include_HEADERS     = cst.h sch.h
diff --git a/alliance/src/aut/src/Makefile.am b/alliance/src/aut/src/Makefile.am
index 3e7db92e..882c5247 100644
--- a/alliance/src/aut/src/Makefile.am
+++ b/alliance/src/aut/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libAut.a
 include_HEADERS     = aut.h
 libAut_a_SOURCES    = autenv.h autfree.h     authash2.h    autsort.h \
diff --git a/alliance/src/b2f/src/Makefile.am b/alliance/src/b2f/src/Makefile.am
index c6dcf75f..763c32c6 100644
--- a/alliance/src/b2f/src/Makefile.am
+++ b/alliance/src/b2f/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = b2f
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DB2F_VERSION=\"@B2F_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 b2f_LDADD = @ALLIANCE_LIBS@ \
           -lAbt -lAbv -lAbe -lFtl -lFks -lFvh -lFsm \
diff --git a/alliance/src/b2f/src/b2f_main.c b/alliance/src/b2f/src/b2f_main.c
index e980708c..f81b65ea 100644
--- a/alliance/src/b2f/src/b2f_main.c
+++ b/alliance/src/b2f/src/b2f_main.c
@@ -127,7 +127,7 @@ int main( argc, argv )
   char  *StringInitial = (char *)0;
 
   alliancebanner_with_authors(
-      "B2F", B2F_VERSION, "Translator Behavior To FSM Format", 
+      "B2F", VERSION, "Translator Behavior To FSM Format", 
       "1999", ALLIANCE_VERSION, "Ludovic Jacomme" );
   mbkenv();
   autenv();
diff --git a/alliance/src/bdd/src/Makefile.am b/alliance/src/bdd/src/Makefile.am
index 6e429ef1..20026678 100644
--- a/alliance/src/bdd/src/Makefile.am
+++ b/alliance/src/bdd/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libBdd.a
 include_HEADERS     = bdd.h
 libBdd_a_SOURCES    = \
diff --git a/alliance/src/beh/src/Makefile.am b/alliance/src/beh/src/Makefile.am
index 8b09000f..688d268c 100644
--- a/alliance/src/beh/src/Makefile.am
+++ b/alliance/src/beh/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libBeh.a
 include_HEADERS     = beh.h
 libBeh_a_SOURCES    = \
diff --git a/alliance/src/bhl/src/Makefile.am b/alliance/src/bhl/src/Makefile.am
index 1b9b7cd3..6f680d12 100644
--- a/alliance/src/bhl/src/Makefile.am
+++ b/alliance/src/bhl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libBhl.a
 include_HEADERS     = bhl.h
 libBhl_a_SOURCES    = \
diff --git a/alliance/src/boog/src/Makefile.am b/alliance/src/boog/src/Makefile.am
index 70926acb..5af599d0 100644
--- a/alliance/src/boog/src/Makefile.am
+++ b/alliance/src/boog/src/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-CFLAGS = @ALLIANCE_CFLAGS@ \
-         -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 bin_PROGRAMS = boog
 
diff --git a/alliance/src/boom/configure.in b/alliance/src/boom/configure.in
index ff8dea02..340d2061 100644
--- a/alliance/src/boom/configure.in
+++ b/alliance/src/boom/configure.in
@@ -26,6 +26,8 @@ AC_PROG_MAKE_SET
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
+AC_CHECK_LIB(m, exp)
+
 AM_ALLIANCE
 
 AC_OUTPUT([
diff --git a/alliance/src/boom/src/Makefile.am b/alliance/src/boom/src/Makefile.am
index 2a99d627..383a2569 100644
--- a/alliance/src/boom/src/Makefile.am
+++ b/alliance/src/boom/src/Makefile.am
@@ -2,10 +2,10 @@
 
 bin_PROGRAMS = boom
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DBOOM_VERSION=\"@BOOM_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 boom_LDADD = @ALLIANCE_LIBS@ \
-          -lAbv -lAbe -lAbt -lBdd -lAbl -lAut -lMut -lm
+          -lAbv -lAbe -lAbt -lBdd -lAbl -lAut -lMut
 
 boom_SOURCES = \
 boom_abl.c        boom_cost.h       boom_main.c       boom_procrast.h \
diff --git a/alliance/src/boom/src/boom_main.c b/alliance/src/boom/src/boom_main.c
index 5035e212..c0a05ae2 100644
--- a/alliance/src/boom/src/boom_main.c
+++ b/alliance/src/boom/src/boom_main.c
@@ -153,7 +153,7 @@ int main( argc, argv )
   int Iteration         = 0;
   int Amplitude         = 0;
 
-  alliancebanner_with_authors( "BooM", BOOM_VERSION, "BOOlean Minimization", 
+  alliancebanner_with_authors( "BooM", VERSION, "BOOlean Minimization", 
                   "2000", ALLIANCE_VERSION, "Ludovic Jacomme" );
   mbkenv();
   autenv();
diff --git a/alliance/src/btr/src/Makefile.am b/alliance/src/btr/src/Makefile.am
index 2e3a7594..7682f555 100644
--- a/alliance/src/btr/src/Makefile.am
+++ b/alliance/src/btr/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libBtr.a
 include_HEADERS     = btr.h
 libBtr_a_SOURCES    = \
diff --git a/alliance/src/bvl/src/Makefile.am b/alliance/src/bvl/src/Makefile.am
index 8d172aa3..30c0be5f 100644
--- a/alliance/src/bvl/src/Makefile.am
+++ b/alliance/src/bvl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libBvl.a
 include_HEADERS     = bvl.h
 libBvl_a_SOURCES    = bvl_bcomp_y.y bvl_bcomp_l.l \
diff --git a/alliance/src/dreal/src/GMH_panel.c b/alliance/src/dreal/src/GMH_panel.c
index 0b32f71a..5eb1d1b9 100644
--- a/alliance/src/dreal/src/GMH_panel.c
+++ b/alliance/src/dreal/src/GMH_panel.c
@@ -261,7 +261,7 @@ void DrealBuildPresentPanel()
                  XmNactivateCallback,
                  DrealExitDialogCallback, NULL );
 
-  sprintf( Buffer, "\nDesign Real layout\nVersion %s", DREAL_VERSION );
+  sprintf( Buffer, "\nDesign Real layout\nVersion %s", VERSION );
 
   PanelString = XmStringCreateLtoR( Buffer, "Panel_charset2" );
 
diff --git a/alliance/src/dreal/src/GMS_setup.c b/alliance/src/dreal/src/GMS_setup.c
index 26826eec..dc3e6e18 100644
--- a/alliance/src/dreal/src/GMS_setup.c
+++ b/alliance/src/dreal/src/GMS_setup.c
@@ -149,7 +149,7 @@ void DrealWriteTopLevelValues()
   Values[1] = Values[1] - DREAL_TOPLEVEL_TRANSLATE_Y;
   Values[4] = 1;
   
-  fprintf( FileConfig, "VERSION: %s\n", DREAL_VERSION );
+  fprintf( FileConfig, "VERSION: %s\n", VERSION );
   fprintf( FileConfig, "X: %d, Y: %d, WIDTH: %d, HEIGHT: %d, MANAGED: %d\n",
            Values[0], Values[1], Values[2], Values[3], Values[4] );
 
@@ -241,7 +241,7 @@ char DrealReadTopLevelValues()
 
   fscanf( FileConfig, "VERSION: %s\n", Version );
 
-  if ( strcmp( Version, DREAL_VERSION ) )
+  if ( strcmp( Version, VERSION ) )
   {
     rdsend();
     return( 0 );
diff --git a/alliance/src/dreal/src/GRD_error.c b/alliance/src/dreal/src/GRD_error.c
index e6a71bd4..f03014f7 100644
--- a/alliance/src/dreal/src/GRD_error.c
+++ b/alliance/src/dreal/src/GRD_error.c
@@ -203,11 +203,11 @@ void DrealInitializeErrorMessage( Debug )
 
   if ( DrealNormalMode )
   {
-    sprintf( DrealOutFileName, "/tmp/%s_out_%d", DREAL_TOOL_NAME, getpid() ); 
+    sprintf( DrealOutFileName, "/tmp/%s_out_%d", PACKAGE, getpid() ); 
   }
 
-  sprintf( DrealErrFileName, "/tmp/%s_err_%d", DREAL_TOOL_NAME, getpid() );
-  sprintf( DrealAllFileName, "/tmp/%s_all_%d", DREAL_TOOL_NAME, getpid() );
+  sprintf( DrealErrFileName, "/tmp/%s_err_%d", PACKAGE, getpid() );
+  sprintf( DrealAllFileName, "/tmp/%s_all_%d", PACKAGE, getpid() );
 
   DrealStreamErr = freopen( DrealErrFileName, "w+", stderr);
   DrealStreamAll = fopen  ( DrealAllFileName, "w+"        );
diff --git a/alliance/src/dreal/src/Makefile.am b/alliance/src/dreal/src/Makefile.am
index f87bb8f9..ee5ca114 100644
--- a/alliance/src/dreal/src/Makefile.am
+++ b/alliance/src/dreal/src/Makefile.am
@@ -1,9 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = dreal
-CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DDREAL_VERSION=\"@DREAL_VERSION@\" \
-         -DDREAL_TOOL_NAME=\"dreal\" \
-         -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
          -DDREAL_DEFAULT_TECHNO_NAME=\"etc/cmos_7.dreal\" \
          -DGMS_FILE_NAME=\".dreal.cfg\" \
          -DDREAL_WINDOW_DX=\"DREAL_WINDOW_DX\" \
@@ -13,8 +11,7 @@ CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DDREAL_VERSION=\"@DREAL_VERSION@\" \
          -DDREAL_WINDOW_SIDE=\"DREAL_WINDOW_SIDE\" 
 
 dreal_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
--lRtl -lRgs -lRcf -lRut -lRfm -lRpr -lRds -lMpu -lMap -lMmg -lMcp -lMph -lMut  \
--lm
+-lRtl -lRgs -lRcf -lRut -lRfm -lRpr -lRds -lMpu -lMap -lMmg -lMcp -lMph -lMut 
 
 
 INCLUDES = @INCLUDE_MOTIF@
diff --git a/alliance/src/dreal/src/dreal.c b/alliance/src/dreal/src/dreal.c
index 17d89771..eb17b2a1 100644
--- a/alliance/src/dreal/src/dreal.c
+++ b/alliance/src/dreal/src/dreal.c
@@ -88,7 +88,7 @@
 
 void DrealPresent()
 {
-  alliancebanner_with_authors( "Dreal", DREAL_VERSION,
+  alliancebanner_with_authors( "Dreal", VERSION,
                   "Design  Real layout", "1999",
                   ALLIANCE_VERSION, "Ludovic Jacomme" );
 }
diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am
index 306d29cb..d979743b 100644
--- a/alliance/src/druc/src/Makefile.am
+++ b/alliance/src/druc/src/Makefile.am
@@ -18,11 +18,11 @@ drucompi_l.c : $(srcdir)/drucompi_l.l drucompi_y.h
 
 bin_PROGRAMS = druc
 
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 druc_LDADD = @ALLIANCE_LIBS@ \
 -L. -lVrd -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu -lMcp -lMap -lMmg -lMph \
--lMut -lm
+-lMut
 
 druc_SOURCES = \
 drucbath.c drucbath.h
diff --git a/alliance/src/fks/src/Makefile.am b/alliance/src/fks/src/Makefile.am
index c1dbd71c..09c52234 100644
--- a/alliance/src/fks/src/Makefile.am
+++ b/alliance/src/fks/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libFks.a
 include_HEADERS     = fks.h
 libFks_a_SOURCES    = \
diff --git a/alliance/src/flatbeh/src/Makefile.am b/alliance/src/flatbeh/src/Makefile.am
index 4f5b679e..1c4b48b3 100644
--- a/alliance/src/flatbeh/src/Makefile.am
+++ b/alliance/src/flatbeh/src/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS    = @ALLIANCE_CFLAGS@ 
 
 bin_PROGRAMS = flatbeh
 
diff --git a/alliance/src/fmi/src/Makefile.am b/alliance/src/fmi/src/Makefile.am
index bcea1c8b..16761a3b 100644
--- a/alliance/src/fmi/src/Makefile.am
+++ b/alliance/src/fmi/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = fmi
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DFMI_VERSION=\"@FMI_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 fmi_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
diff --git a/alliance/src/fmi/src/fmi_main.c b/alliance/src/fmi/src/fmi_main.c
index bd5208c1..10aa1113 100644
--- a/alliance/src/fmi/src/fmi_main.c
+++ b/alliance/src/fmi/src/fmi_main.c
@@ -113,7 +113,7 @@ int main( argc, argv )
 
   int    FlagVerbose = 0;
 
-  alliancebanner_with_contrib( "FMI", FMI_VERSION, "FSM Minimization", "2000",
+  alliancebanner_with_contrib( "FMI", VERSION, "FSM Minimization", "2000",
       ALLIANCE_VERSION, "Frédéric Pétrot, Ludovic Jacomme", "Jean-Marie Alexandre" );
 
   mbkenv();
diff --git a/alliance/src/fsm/src/Makefile.am b/alliance/src/fsm/src/Makefile.am
index 864a12ee..aa84d310 100644
--- a/alliance/src/fsm/src/Makefile.am
+++ b/alliance/src/fsm/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libFsm.a
 include_HEADERS     = fsm.h
 libFsm_a_SOURCES    = \
diff --git a/alliance/src/fsp/src/Makefile.am b/alliance/src/fsp/src/Makefile.am
index e273f708..c3f06c66 100644
--- a/alliance/src/fsp/src/Makefile.am
+++ b/alliance/src/fsp/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = fsp
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DFSP_VERSION=\"@FSP_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 fsp_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
diff --git a/alliance/src/fsp/src/fsp_main.c b/alliance/src/fsp/src/fsp_main.c
index 8f3dc08e..1bad02df 100644
--- a/alliance/src/fsp/src/fsp_main.c
+++ b/alliance/src/fsp/src/fsp_main.c
@@ -120,7 +120,7 @@ int main( argc, argv )
   int    FlagVerbose = 0;
   int    FlagDebug   = 0;
 
-  alliancebanner_with_authors( "FSP", FSP_VERSION, "FSM formal Proof", "1999",
+  alliancebanner_with_authors( "FSP", VERSION, "FSM formal Proof", "1999",
       ALLIANCE_VERSION, "Ludovic Jacomme" );
 
   mbkenv();
diff --git a/alliance/src/ftl/src/Makefile.am b/alliance/src/ftl/src/Makefile.am
index 3d1215c4..fa248e27 100644
--- a/alliance/src/ftl/src/Makefile.am
+++ b/alliance/src/ftl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libFtl.a
 include_HEADERS     = ftl.h
 libFtl_a_SOURCES    = \
diff --git a/alliance/src/fvh/src/Makefile.am b/alliance/src/fvh/src/Makefile.am
index b87fd283..2ba9e705 100644
--- a/alliance/src/fvh/src/Makefile.am
+++ b/alliance/src/fvh/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libFvh.a
 include_HEADERS     = fvh.h
 libFvh_a_SOURCES    = fbl_bcomp_y.y fbl_bcomp_l.l \
diff --git a/alliance/src/gcp/src/Makefile.am b/alliance/src/gcp/src/Makefile.am
index 8d4104bb..e6449ba7 100644
--- a/alliance/src/gcp/src/Makefile.am
+++ b/alliance/src/gcp/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libGcp.a
 include_HEADERS     = gcp.h
 libGcp_a_SOURCES    = c_ccomp.y \
diff --git a/alliance/src/genlib/src/Makefile.am b/alliance/src/genlib/src/Makefile.am
index 7fb0154b..803cb8b6 100644
--- a/alliance/src/genlib/src/Makefile.am
+++ b/alliance/src/genlib/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libMgn.a
 include_HEADERS     = mgn.h mbkgen.h genlib.h
 libMgn_a_SOURCES    = genlib.c
diff --git a/alliance/src/graal/src/GMH_panel.c b/alliance/src/graal/src/GMH_panel.c
index a26c18d9..7f26ce97 100644
--- a/alliance/src/graal/src/GMH_panel.c
+++ b/alliance/src/graal/src/GMH_panel.c
@@ -265,7 +265,7 @@ void GraalBuildPresentPanel()
                  XmNactivateCallback,
                  GraalExitDialogCallback, NULL );
 
-  sprintf( Buffer, "\nGraphic layout editor\nVersion %s", GRAAL_VERSION );
+  sprintf( Buffer, "\nGraphic layout editor\nVersion %s", VERSION );
 
   PanelString = XmStringCreateLtoR( Buffer, "Panel_charset2" );
 
diff --git a/alliance/src/graal/src/GMS_setup.c b/alliance/src/graal/src/GMS_setup.c
index 9ba8f320..3c32dcfb 100644
--- a/alliance/src/graal/src/GMS_setup.c
+++ b/alliance/src/graal/src/GMS_setup.c
@@ -149,7 +149,7 @@ void GraalWriteTopLevelValues()
   Values[1] = Values[1] - GRAAL_TOPLEVEL_TRANSLATE_Y;
   Values[4] = 1;
   
-  fprintf( FileConfig, "VERSION: %s\n", GRAAL_VERSION );
+  fprintf( FileConfig, "VERSION: %s\n", VERSION );
   fprintf( FileConfig, "X: %d, Y: %d, WIDTH: %d, HEIGHT: %d, MANAGED: %d\n",
            Values[0], Values[1], Values[2], Values[3], Values[4] );
 
@@ -242,7 +242,7 @@ char GraalReadTopLevelValues()
 
   fscanf( FileConfig, "VERSION: %s\n", Version );
 
-  if ( strcmp( Version, GRAAL_VERSION ) )
+  if ( strcmp( Version, VERSION ) )
   {
     rdsend();
     return( 0 );
diff --git a/alliance/src/graal/src/GRM_error.c b/alliance/src/graal/src/GRM_error.c
index 2bfa95c2..67aaaa8d 100644
--- a/alliance/src/graal/src/GRM_error.c
+++ b/alliance/src/graal/src/GRM_error.c
@@ -203,11 +203,11 @@ void GraalInitializeErrorMessage( Debug )
 
   if ( GraalNormalMode )
   {
-    sprintf( GraalOutFileName, "/tmp/%s_out_%d", GRAAL_TOOL_NAME, getpid() ); 
+    sprintf( GraalOutFileName, "/tmp/%s_out_%d", PACKAGE, getpid() ); 
   }
 
-  sprintf( GraalErrFileName, "/tmp/%s_err_%d", GRAAL_TOOL_NAME, getpid() );
-  sprintf( GraalAllFileName, "/tmp/%s_all_%d", GRAAL_TOOL_NAME, getpid() );
+  sprintf( GraalErrFileName, "/tmp/%s_err_%d", PACKAGE, getpid() );
+  sprintf( GraalAllFileName, "/tmp/%s_all_%d", PACKAGE, getpid() );
 
   GraalStreamErr = freopen( GraalErrFileName, "w+", stderr);
   GraalStreamAll = fopen  ( GraalAllFileName, "w+"        );
diff --git a/alliance/src/graal/src/Makefile.am b/alliance/src/graal/src/Makefile.am
index 82774e6e..b5c40c2b 100644
--- a/alliance/src/graal/src/Makefile.am
+++ b/alliance/src/graal/src/Makefile.am
@@ -1,9 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = graal
-CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DGRAAL_VERSION=\"@GRAAL_VERSION@\" \
-         -DGRAAL_TOOL_NAME=\"graal\" \
-         -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
          -DGRAAL_DEFAULT_TECHNO_NAME=\"etc/cmos_12.graal\" \
          -DGMS_FILE_NAME=\".graal.cfg\" \
          -DGRAAL_WINDOW_DX=\"GRAAL_WINDOW_DX\" \
@@ -14,7 +12,7 @@ CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DGRAAL_VERSION=\"@GRAAL_VERSION@\" \
 
 graal_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
 -lVrd -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu \
--lMap -lMmg -lMcp -lMph -lMut -lm
+-lMap -lMmg -lMcp -lMph -lMut
 
 INCLUDES = @INCLUDE_MOTIF@
 
diff --git a/alliance/src/graal/src/graal.c b/alliance/src/graal/src/graal.c
index f813f673..c40a617e 100644
--- a/alliance/src/graal/src/graal.c
+++ b/alliance/src/graal/src/graal.c
@@ -88,7 +88,7 @@
 
 void GraalPresent()
 {
-  alliancebanner_with_authors( "Graal", GRAAL_VERSION,
+  alliancebanner_with_authors( "Graal", VERSION,
                   "Graphic layout editor", "1999",
                   ALLIANCE_VERSION,
                   "Ludovic Jacomme and Frederic Venot" );
diff --git a/alliance/src/k2f/src/Makefile.am b/alliance/src/k2f/src/Makefile.am
index 9f0ddc9f..05619334 100644
--- a/alliance/src/k2f/src/Makefile.am
+++ b/alliance/src/k2f/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = k2f
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DK2F_VERSION=\"@K2F_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 k2f_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
diff --git a/alliance/src/k2f/src/k2f_main.c b/alliance/src/k2f/src/k2f_main.c
index b4c27777..67b2a1e6 100644
--- a/alliance/src/k2f/src/k2f_main.c
+++ b/alliance/src/k2f/src/k2f_main.c
@@ -109,7 +109,7 @@ int main( argc, argv )
   char  *OutputFormat;
   int    Number;
 
-  alliancebanner_with_authors( "K2F", K2F_VERSION,
+  alliancebanner_with_authors( "K2F", VERSION,
       "Translator Kiss <-> FSM Format", "1996", ALLIANCE_VERSION,
       "Ludovic Jacomme" );
 
diff --git a/alliance/src/l2p/src/Makefile.am b/alliance/src/l2p/src/Makefile.am
index 7760dd11..b510a701 100644
--- a/alliance/src/l2p/src/Makefile.am
+++ b/alliance/src/l2p/src/Makefile.am
@@ -2,13 +2,13 @@
 
 bin_PROGRAMS = l2p
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DL2P_VERSION=\"@L2P_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 l2p_LDADD = @ALLIANCE_LIBS@ \
  -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
  -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
  -lMsl -lMgl \
- -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds  -lm
+ -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds
 
 l2p_SOURCES = \
 drive_ps.c  rps_inc.h   tmp_man.c \
diff --git a/alliance/src/l2p/src/drive_ps.c b/alliance/src/l2p/src/drive_ps.c
index 7af82ab2..558680aa 100644
--- a/alliance/src/l2p/src/drive_ps.c
+++ b/alliance/src/l2p/src/drive_ps.c
@@ -46,7 +46,7 @@
 /* printer.                                                                 */
 /****************************************************************************/
 
-#ident "$Id: drive_ps.c,v 1.2 2002/04/03 15:31:13 ludo Exp $"
+#ident "$Id: drive_ps.c,v 1.3 2002/04/09 13:45:21 xtof Exp $"
 
 #define DRIVE2PS
 
@@ -375,7 +375,7 @@ rps_par *p;
 		pg->ps_x, pg->ps_y, pg->ps_x+pg->ps_w,
 		pg->ps_y+pg->ps_h);
 		rps_put (pg, buf);
-		sprintf (buf, "%%%%Creator: Rps v%s", L2P_VERSION);
+		sprintf (buf, "%%%%Creator: Rps v%s", VERSION);
 		sprintf (buf, "%s with%s\n", buf, p->cmdline);
 		rps_put (pg, buf);
 		sprintf (buf, "%%SCALE=%f\n", p->tops);
@@ -449,7 +449,7 @@ rps_par *p;
 			pg->ps_x, pg->ps_y, pg->ps_x+pg->ps_w,
 			pg->ps_y+pg->ps_h);
 			rps_put (pg, buf);
-			sprintf (buf, "%%%%Creator: Rps v%s", L2P_VERSION);
+			sprintf (buf, "%%%%Creator: Rps v%s", VERSION);
 			sprintf (buf, "%s with%s\n", buf, p->cmdline);
 			rps_put (pg, buf);
 			sprintf (buf, "%%SCALE=%f\n", p->tops);
diff --git a/alliance/src/l2p/src/l2p.c b/alliance/src/l2p/src/l2p.c
index 199aa13b..3953c3f2 100644
--- a/alliance/src/l2p/src/l2p.c
+++ b/alliance/src/l2p/src/l2p.c
@@ -39,7 +39,7 @@
 /*                                                                          */
 /****************************************************************************/
 
-#ident "$Id: l2p.c,v 1.2 2002/04/03 15:31:13 ludo Exp $"
+#ident "$Id: l2p.c,v 1.3 2002/04/09 13:45:21 xtof Exp $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -107,7 +107,7 @@ struct rps_param	*param;
 			exit (0);
 		};
 	};
-	alliancebanner ("L2P",L2P_VERSION,
+	alliancebanner ("L2P",VERSION,
 		"(L)ayout to(2) (P)aper: A tool for PostScript plots",
 		"1994",ALLIANCE_VERSION);
 	if (argc == 1) {
diff --git a/alliance/src/log/src/Makefile.am b/alliance/src/log/src/Makefile.am
index 1d6df377..5de50097 100644
--- a/alliance/src/log/src/Makefile.am
+++ b/alliance/src/log/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libLog.a
 include_HEADERS     = log.h
 libLog_a_SOURCES    = \
diff --git a/alliance/src/loon/src/Makefile.am b/alliance/src/loon/src/Makefile.am
index bd5cde45..8fdb20d5 100644
--- a/alliance/src/loon/src/Makefile.am
+++ b/alliance/src/loon/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = loon
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 loon_LDADD = @ALLIANCE_LIBS@ \
           -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvl -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
diff --git a/alliance/src/lvx/src/Makefile.am b/alliance/src/lvx/src/Makefile.am
index 003166ef..6eacc7eb 100644
--- a/alliance/src/lvx/src/Makefile.am
+++ b/alliance/src/lvx/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 bin_PROGRAMS = lvx
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 lvx_LDADD = @ALLIANCE_LIBS@ \
           -lMlu \
diff --git a/alliance/src/lynx/src/Makefile.am b/alliance/src/lynx/src/Makefile.am
index 3159d593..f882f751 100644
--- a/alliance/src/lynx/src/Makefile.am
+++ b/alliance/src/lynx/src/Makefile.am
@@ -2,19 +2,19 @@
 
 bin_PROGRAMS = lynx flatrds
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@ -DLYNX_VERSION=\"@LYNX_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 lynx_LDADD = @ALLIANCE_LIBS@ \
  -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
  -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
  -lMsl -lMgl \
- -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lm
+ -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds
 
 flatrds_LDADD = @ALLIANCE_LIBS@ \
  -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
  -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
  -lMsl -lMgl \
- -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lm
+ -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds
 
 flatrds_SOURCES = flatrds.c
 
diff --git a/alliance/src/mbk/src/Makefile.am b/alliance/src/mbk/src/Makefile.am
index 031fc273..db30b957 100644
--- a/alliance/src/mbk/src/Makefile.am
+++ b/alliance/src/mbk/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMph.a libMpu.a libMlo.a libMlu.a libMut.a libRcn.a
 include_HEADERS     = mlu.h mlo.h mpu.h mph.h mut.h rcn.h
 libMph_a_SOURCES    = mbk_ph.c mbk_ph.h
diff --git a/alliance/src/mbkal/src/Makefile.am b/alliance/src/mbkal/src/Makefile.am
index 0e2e2791..0bae97bc 100644
--- a/alliance/src/mbkal/src/Makefile.am
+++ b/alliance/src/mbkal/src/Makefile.am
@@ -1,3 +1,3 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMal.a
 libMal_a_SOURCES    = alc_driv_l.c alc_pars_l.c alc_pars_l6.c mal.h
diff --git a/alliance/src/mbkap/src/Makefile.am b/alliance/src/mbkap/src/Makefile.am
index 37d26f0c..8790f9ba 100644
--- a/alliance/src/mbkap/src/Makefile.am
+++ b/alliance/src/mbkap/src/Makefile.am
@@ -1,3 +1,3 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMap.a
 libMap_a_SOURCES    = alc_driv_p.c alc_pars_p.c map.h
diff --git a/alliance/src/mbkedif/src/Makefile.am b/alliance/src/mbkedif/src/Makefile.am
index 611bcbef..11b105e8 100644
--- a/alliance/src/mbkedif/src/Makefile.am
+++ b/alliance/src/mbkedif/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMel.a
 libMel_a_SOURCES    = time.c driver.c parser_y.y parser_l.l
 CLEANFILES          = parser_y.c parser_y.h parser_l.c
diff --git a/alliance/src/mbkhilo/src/Makefile.am b/alliance/src/mbkhilo/src/Makefile.am
index 3dc0eb19..e20cf8cd 100644
--- a/alliance/src/mbkhilo/src/Makefile.am
+++ b/alliance/src/mbkhilo/src/Makefile.am
@@ -1,3 +1,3 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMhl.a
 libMhl_a_SOURCES    = drive_hilo.c
diff --git a/alliance/src/mbkmg/src/Makefile.am b/alliance/src/mbkmg/src/Makefile.am
index a81aea74..bf2032f0 100644
--- a/alliance/src/mbkmg/src/Makefile.am
+++ b/alliance/src/mbkmg/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMmg.a
 libMmg_a_SOURCES    = mbk2mg.c mg2mbk_y.y mg2mbk_l.l mmg.h
 CLEANFILES          = mg2mbk_y.c mg2mbk_y.h mg2mbk_l.c
diff --git a/alliance/src/mbkspice/src/Makefile.am b/alliance/src/mbkspice/src/Makefile.am
index d981d485..2a61adc1 100644
--- a/alliance/src/mbkspice/src/Makefile.am
+++ b/alliance/src/mbkspice/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMsl.a
 libMsl_a_SOURCES    = spi_drive.c spi_drive.h spi_global.c spi_global.h \
                       spi_hash.c spi_hash.h spi_int.c spi_int.h spi_msg.c \
diff --git a/alliance/src/mbkvrlog/src/Makefile.am b/alliance/src/mbkvrlog/src/Makefile.am
index 83b7e2c4..f4523f80 100644
--- a/alliance/src/mbkvrlog/src/Makefile.am
+++ b/alliance/src/mbkvrlog/src/Makefile.am
@@ -1,3 +1,3 @@
-CFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libMgl.a
 libMgl_a_SOURCES    = drive_vlog.c
diff --git a/alliance/src/mbkvti/src/Makefile.am b/alliance/src/mbkvti/src/Makefile.am
index 0a7cea55..bf09ceac 100644
--- a/alliance/src/mbkvti/src/Makefile.am
+++ b/alliance/src/mbkvti/src/Makefile.am
@@ -1,4 +1,4 @@
 lib_LIBRARIES       = libMcp.a libMcl.a
-CFLAGS              = @ALLIANCE_CFLAGS@ -DTECHNO=\"symbolic_cmos\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ -DTECHNO=\"symbolic_cmos\"
 libMcp_a_SOURCES    = drive_vti_p.c drive_vti_p.h parse_vti_p.c mcp.h 
 libMcl_a_SOURCES    = drive_vti_l.c drive_vti_l.h parse_vti_l.c mcl.h
diff --git a/alliance/src/ocp/src/common/Makefile.am b/alliance/src/ocp/src/common/Makefile.am
index 4f10a323..b00e232e 100644
--- a/alliance/src/ocp/src/common/Makefile.am
+++ b/alliance/src/ocp/src/common/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src/common
 
-CXXFLAGS = @ALLIANCE_CFLAGS@
+AM_CXXFLAGS = @ALLIANCE_CFLAGS@
 
 noinst_LIBRARIES = libPCommon.a
 
diff --git a/alliance/src/ocp/src/placer/Makefile.am b/alliance/src/ocp/src/placer/Makefile.am
index 6d7b5721..8e1f355d 100644
--- a/alliance/src/ocp/src/placer/Makefile.am
+++ b/alliance/src/ocp/src/placer/Makefile.am
@@ -4,8 +4,8 @@ YACC = @YACC@ -d
 
 INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/src/placer
 
-CXXFLAGS = @CXXFLAGS@ @ALLIANCE_CFLAGS@
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CXXFLAGS = @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 bin_PROGRAMS = ocp
 
diff --git a/alliance/src/ocr/src/rout/Makefile.am b/alliance/src/ocr/src/rout/Makefile.am
index 341ec0af..786f7321 100644
--- a/alliance/src/ocr/src/rout/Makefile.am
+++ b/alliance/src/ocr/src/rout/Makefile.am
@@ -2,8 +2,8 @@
 
 INCLUDES = -I$(top_srcdir)/src/include
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
-CXXFLAGS = @CXXFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
+AM_CXXFLAGS = @ALLIANCE_CFLAGS@
 
 bin_PROGRAMS = ocr
 
diff --git a/alliance/src/ocr/src/seg/Makefile.am b/alliance/src/ocr/src/seg/Makefile.am
index 85866335..c6a0f888 100644
--- a/alliance/src/ocr/src/seg/Makefile.am
+++ b/alliance/src/ocr/src/seg/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src/include 
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 noinst_LIBRARIES = libocrPath.a
 
diff --git a/alliance/src/ocr/src/util/Makefile.am b/alliance/src/ocr/src/util/Makefile.am
index ec9ac804..31951294 100644
--- a/alliance/src/ocr/src/util/Makefile.am
+++ b/alliance/src/ocr/src/util/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/src/include 
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 noinst_LIBRARIES = libocrUtil.a
 
diff --git a/alliance/src/pat/src/Makefile.am b/alliance/src/pat/src/Makefile.am
index 8fdf4be6..edb2d99e 100644
--- a/alliance/src/pat/src/Makefile.am
+++ b/alliance/src/pat/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libPat.a
 include_HEADERS     = pat.h
 libPat_a_SOURCES    = \
diff --git a/alliance/src/phl/src/Makefile.am b/alliance/src/phl/src/Makefile.am
index 916d3f7b..b8143acf 100644
--- a/alliance/src/phl/src/Makefile.am
+++ b/alliance/src/phl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ 
 lib_LIBRARIES       = libPhl.a
 include_HEADERS     = phl.h
 libPhl_a_SOURCES    = \
diff --git a/alliance/src/ppt/src/Makefile.am b/alliance/src/ppt/src/Makefile.am
index 82b8d0d9..2405fd38 100644
--- a/alliance/src/ppt/src/Makefile.am
+++ b/alliance/src/ppt/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 
 lib_LIBRARIES       = libPpt.a
 include_HEADERS     = ppt.h
diff --git a/alliance/src/rds/src/Makefile.am b/alliance/src/rds/src/Makefile.am
index a71f0eb0..3adcb2de 100644
--- a/alliance/src/rds/src/Makefile.am
+++ b/alliance/src/rds/src/Makefile.am
@@ -4,9 +4,8 @@ lib_LIBRARIES       = libRds.a \
                       libRpr.a \
                       libRwi.a \
                       libRtl.a
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DRTL_DEFAULT_TECHNO=\"etc/cmos_12.rds\" \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@ \
+                      -DRTL_DEFAULT_TECHNO=\"etc/cmos_12.rds\" 
 
 include_HEADERS     = rds.h rfm.h rtl.h rwi.h rpr.h rut.h
 libRds_a_SOURCES    = rdsalloc.c rdsfree.c rdsadd.c rdsdel.c rdsview.c \
diff --git a/alliance/src/rdscif/src/Makefile.am b/alliance/src/rdscif/src/Makefile.am
index 6c338f5a..a6182332 100644
--- a/alliance/src/rdscif/src/Makefile.am
+++ b/alliance/src/rdscif/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 
 lib_LIBRARIES       = libRcf.a
 libRcf_a_SOURCES    = cif_drive.c cif_error.c cif_parse.c rcf.h cif.h  cif_drive.h cif_error.h cif_parse.h
diff --git a/alliance/src/rdsgds/src/Makefile.am b/alliance/src/rdsgds/src/Makefile.am
index 85d3c49c..8b86cf43 100644
--- a/alliance/src/rdsgds/src/Makefile.am
+++ b/alliance/src/rdsgds/src/Makefile.am
@@ -1,4 +1,3 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libRgs.a
 libRgs_a_SOURCES    = gds_drive.h gds_parse.c gds_swap.h gds.h  gds_error.c gds_parse.h rgs.h gds_drive.c gds_error.h gds_swap.c
diff --git a/alliance/src/ring/src/Makefile.am b/alliance/src/ring/src/Makefile.am
index 445e23bc..eed3c326 100644
--- a/alliance/src/ring/src/Makefile.am
+++ b/alliance/src/ring/src/Makefile.am
@@ -2,7 +2,7 @@
 
 YACC = @YACC@ -d
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 bin_PROGRAMS = ring
 
diff --git a/alliance/src/rtd/src/Makefile.am b/alliance/src/rtd/src/Makefile.am
index 55d0516c..d20e56df 100644
--- a/alliance/src/rtd/src/Makefile.am
+++ b/alliance/src/rtd/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libRtd.a
 include_HEADERS     = rtd.h
 libRtd_a_SOURCES    = \
diff --git a/alliance/src/rtn/src/Makefile.am b/alliance/src/rtn/src/Makefile.am
index c68d569c..922bcfd4 100644
--- a/alliance/src/rtn/src/Makefile.am
+++ b/alliance/src/rtn/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libRtn.a
 include_HEADERS     = rtn.h
 libRtn_a_SOURCES    = \
diff --git a/alliance/src/s2r/src/Makefile.am b/alliance/src/s2r/src/Makefile.am
index f32d8911..de2c60b0 100644
--- a/alliance/src/s2r/src/Makefile.am
+++ b/alliance/src/s2r/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = s2r 
 
-CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 s2r_LDADD = @ALLIANCE_LIBS@ \
           -lMpu -lMcp -lMap -lMmg \
diff --git a/alliance/src/scapin/src/Makefile.am b/alliance/src/scapin/src/Makefile.am
index 40b056fd..552398fa 100644
--- a/alliance/src/scapin/src/Makefile.am
+++ b/alliance/src/scapin/src/Makefile.am
@@ -2,8 +2,7 @@
 
 bin_PROGRAMS = scapin
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DSCAPIN_VERSION=\"@SCAPIN_VERSION@\" \
-         -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ \
          -DSCAPIN_DEFAULT_PARAM_NAME=\"etc/sxlib.scapin\"
 
 scapin_LDADD = @ALLIANCE_LIBS@ \
diff --git a/alliance/src/scapin/src/scan_main.c b/alliance/src/scapin/src/scan_main.c
index 2291dcfc..5ff8e2d6 100644
--- a/alliance/src/scapin/src/scan_main.c
+++ b/alliance/src/scapin/src/scan_main.c
@@ -124,7 +124,7 @@ int main( argc, argv )
   int   FlagBuffer  = 0;
 
   alliancebanner_with_contrib( 
-      "Scapin", SCAPIN_VERSION, "SCAn Path INsertion", "2000", ALLIANCE_VERSION,
+      "Scapin", VERSION, "SCAn Path INsertion", "2000", ALLIANCE_VERSION,
       "Ludovic Jacomme", "Ilhem Kazi Tani" );
 
   mbkenv();
diff --git a/alliance/src/scl/src/Makefile.am b/alliance/src/scl/src/Makefile.am
index 34b3d148..b61a0452 100644
--- a/alliance/src/scl/src/Makefile.am
+++ b/alliance/src/scl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libScl.a
 include_HEADERS     = scl.h
 libScl_a_SOURCES    = \
diff --git a/alliance/src/syf/src/Makefile.am b/alliance/src/syf/src/Makefile.am
index 9a4d9402..c52290b9 100644
--- a/alliance/src/syf/src/Makefile.am
+++ b/alliance/src/syf/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = syf
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DSYF_VERSION=\"@SYF_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@
 
 syf_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
diff --git a/alliance/src/syf/src/syf_main.c b/alliance/src/syf/src/syf_main.c
index c95438f1..7d6e14f3 100644
--- a/alliance/src/syf/src/syf_main.c
+++ b/alliance/src/syf/src/syf_main.c
@@ -157,7 +157,7 @@ int main( argc, argv )
   int   FlagFormat    = 0;
 
   alliancebanner_with_authors( 
-      "SYF", SYF_VERSION, "FSM Synthesizer", "1995",
+      "SYF", VERSION, "FSM Synthesizer", "1995",
       ALLIANCE_VERSION, "Ludovic Jacomme and Chaker Sarwary" );
 
   mbkenv();
diff --git a/alliance/src/vasy/src/Makefile.am b/alliance/src/vasy/src/Makefile.am
index e468835b..00fab9d9 100644
--- a/alliance/src/vasy/src/Makefile.am
+++ b/alliance/src/vasy/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = vasy
 
-CFLAGS = @ALLIANCE_CFLAGS@ -DVASY_VERSION=\"@VASY_VERSION@\"
+AM_CFLAGS = @ALLIANCE_CFLAGS@ 
 
 vasy_LDADD = @ALLIANCE_LIBS@ \
           -lRtd -lRtn -lVtl -lVvh -lVpd -lVpn -lVbl -lVbh \
diff --git a/alliance/src/vasy/src/vasy_main.c b/alliance/src/vasy/src/vasy_main.c
index a0887501..5c917b9b 100644
--- a/alliance/src/vasy/src/vasy_main.c
+++ b/alliance/src/vasy/src/vasy_main.c
@@ -263,7 +263,7 @@ int main( argc, argv )
 
 
   alliancebanner_with_contrib(
-      "VASY", VASY_VERSION, "VHDL Analyzer for SYnthesis",
+      "VASY", VERSION, "VHDL Analyzer for SYnthesis",
       "2000", ALLIANCE_VERSION, "Ludovic Jacomme", "Frederic Petrot" );
 
   mbkenv();
diff --git a/alliance/src/vbh/src/Makefile.am b/alliance/src/vbh/src/Makefile.am
index 36509f49..a34d1d47 100644
--- a/alliance/src/vbh/src/Makefile.am
+++ b/alliance/src/vbh/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVbh.a
 include_HEADERS     = vbh.h
 libVbh_a_SOURCES    = \
diff --git a/alliance/src/vbl/src/Makefile.am b/alliance/src/vbl/src/Makefile.am
index 5cd5c2f2..30b7476a 100644
--- a/alliance/src/vbl/src/Makefile.am
+++ b/alliance/src/vbl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVbl.a
 include_HEADERS     = vbl.h
 libVbl_a_SOURCES    = vbl_bcomp_y.y vbl_bcomp_l.l \
diff --git a/alliance/src/vex/src/Makefile.am b/alliance/src/vex/src/Makefile.am
index 87f1ca03..b8a5bc0d 100644
--- a/alliance/src/vex/src/Makefile.am
+++ b/alliance/src/vex/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVex.a
 include_HEADERS     = vex.h
 libVex_a_SOURCES    = \
diff --git a/alliance/src/vpd/src/Makefile.am b/alliance/src/vpd/src/Makefile.am
index 2f0b2796..8ad09acf 100644
--- a/alliance/src/vpd/src/Makefile.am
+++ b/alliance/src/vpd/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVpd.a
 include_HEADERS     = vpd.h
 libVpd_a_SOURCES    = \
diff --git a/alliance/src/vpn/src/Makefile.am b/alliance/src/vpn/src/Makefile.am
index 54edd4a2..6b9d0cf6 100644
--- a/alliance/src/vpn/src/Makefile.am
+++ b/alliance/src/vpn/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVpn.a
 include_HEADERS     = vpn.h
 libVpn_a_SOURCES    = \
diff --git a/alliance/src/vtl/src/Makefile.am b/alliance/src/vtl/src/Makefile.am
index 2d971600..19bb1c70 100644
--- a/alliance/src/vtl/src/Makefile.am
+++ b/alliance/src/vtl/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVtl.a
 include_HEADERS     = vtl.h
 libVtl_a_SOURCES    = \
diff --git a/alliance/src/vvh/src/Makefile.am b/alliance/src/vvh/src/Makefile.am
index 3ed685a6..4a336d48 100644
--- a/alliance/src/vvh/src/Makefile.am
+++ b/alliance/src/vvh/src/Makefile.am
@@ -1,5 +1,4 @@
-CFLAGS              = @ALLIANCE_CFLAGS@ \
-                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+AM_CFLAGS           = @ALLIANCE_CFLAGS@
 lib_LIBRARIES       = libVvh.a
 include_HEADERS     = vvh.h
 libVvh_a_SOURCES    = \
diff --git a/alliance/src/xfsm/src/Makefile.am b/alliance/src/xfsm/src/Makefile.am
index 5a3d55dd..19e1f35a 100644
--- a/alliance/src/xfsm/src/Makefile.am
+++ b/alliance/src/xfsm/src/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xfsm
-CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXFSM_VERSION=\"@XFSM_VERSION@\" \
-         -DXFSM_TOOL_NAME=\"xfsm\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
 	 -DXFSM_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xfsm.par\" \
 	 -DXMS_FILE_NAME=\".xfsm.cfg\"
 
diff --git a/alliance/src/xfsm/src/XFS_error.c b/alliance/src/xfsm/src/XFS_error.c
index a5e48e6f..379bdbee 100644
--- a/alliance/src/xfsm/src/XFS_error.c
+++ b/alliance/src/xfsm/src/XFS_error.c
@@ -159,11 +159,11 @@ void XfsmInitializeErrorMessage( Debug )
 
   if ( XfsmNormalMode )
   {
-    sprintf( XfsmOutFileName, "/tmp/%s_out_%d", XFSM_TOOL_NAME, getpid() ); 
+    sprintf( XfsmOutFileName, "/tmp/%s_out_%d", PACKAGE, getpid() ); 
   }
 
-  sprintf( XfsmErrFileName, "/tmp/%s_err_%d", XFSM_TOOL_NAME, getpid() );
-  sprintf( XfsmAllFileName, "/tmp/%s_all_%d", XFSM_TOOL_NAME, getpid() );
+  sprintf( XfsmErrFileName, "/tmp/%s_err_%d", PACKAGE, getpid() );
+  sprintf( XfsmAllFileName, "/tmp/%s_all_%d", PACKAGE, getpid() );
 
   XfsmStreamErr = freopen( XfsmErrFileName, "w+", stderr);
   XfsmStreamAll = fopen  ( XfsmAllFileName, "w+"        );
diff --git a/alliance/src/xfsm/src/XMH_panel.c b/alliance/src/xfsm/src/XMH_panel.c
index 013d87ae..892c1bc2 100644
--- a/alliance/src/xfsm/src/XMH_panel.c
+++ b/alliance/src/xfsm/src/XMH_panel.c
@@ -263,7 +263,7 @@ void XfsmBuildPresentPanel()
                  XmNactivateCallback,
                  XfsmExitDialogCallback, NULL );
 
-  sprintf( Buffer, "\nGraphic FSM Viewer\nVersion %s", XFSM_VERSION );
+  sprintf( Buffer, "\nGraphic FSM Viewer\nVersion %s", VERSION );
 
   PanelString = XmStringCreateLtoR( Buffer, "Panel_charset2" );
 
diff --git a/alliance/src/xfsm/src/XMS_setup.c b/alliance/src/xfsm/src/XMS_setup.c
index e89bc259..4740490d 100644
--- a/alliance/src/xfsm/src/XMS_setup.c
+++ b/alliance/src/xfsm/src/XMS_setup.c
@@ -149,7 +149,7 @@ void XfsmWriteTopLevelValues()
   Values[1] = Values[1] - XFSM_TOPLEVEL_TRANSLATE_Y;
   Values[4] = 1;
   
-  fprintf( FileConfig, "VERSION: %s\n", XFSM_VERSION );
+  fprintf( FileConfig, "VERSION: %s\n", VERSION );
   fprintf( FileConfig, "X: %d, Y: %d, WIDTH: %d, HEIGHT: %d, MANAGED: %d\n",
            Values[0], Values[1], Values[2], Values[3], Values[4] );
 
@@ -236,7 +236,7 @@ char XfsmReadTopLevelValues()
 
   fscanf( FileConfig, "VERSION: %s\n", Version );
 
-  if ( strcmp( Version, XFSM_VERSION ) )
+  if ( strcmp( Version, VERSION ) )
   {
     autend();
     return( 0 );
diff --git a/alliance/src/xfsm/src/xfsm.c b/alliance/src/xfsm/src/xfsm.c
index 80250f9d..5e84a8cb 100644
--- a/alliance/src/xfsm/src/xfsm.c
+++ b/alliance/src/xfsm/src/xfsm.c
@@ -88,7 +88,7 @@
 
 void XfsmPresent()
 {
-  alliancebanner_with_authors( "Xfsm", XFSM_VERSION,
+  alliancebanner_with_authors( "Xfsm", VERSION,
                   "Graphic FSM Viewer", "1995",
                   ALLIANCE_VERSION, "Ludovic Jacomme" );
 }
diff --git a/alliance/src/xpat/src/Makefile.am b/alliance/src/xpat/src/Makefile.am
index c0782f05..d5c60028 100644
--- a/alliance/src/xpat/src/Makefile.am
+++ b/alliance/src/xpat/src/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xpat
-CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXPAT_VERSION=\"@XPAT_VERSION@\" \
-         -DXPAT_TOOL_NAME=\"xpat\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
 	 -DXPAT_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xpat.par\" \
 	 -DXMS_FILE_NAME=\".xpat.cfg\"
 
diff --git a/alliance/src/xpat/src/XMH_panel.c b/alliance/src/xpat/src/XMH_panel.c
index 4d72ecd1..a0968509 100644
--- a/alliance/src/xpat/src/XMH_panel.c
+++ b/alliance/src/xpat/src/XMH_panel.c
@@ -262,7 +262,7 @@ void XpatBuildPresentPanel()
                  XmNactivateCallback,
                  XpatExitDialogCallback, NULL );
 
-  sprintf( Buffer, "\nGraphic Pattern Viewer\nVersion %s", XPAT_VERSION );
+  sprintf( Buffer, "\nGraphic Pattern Viewer\nVersion %s", VERSION );
 
   PanelString = XmStringCreateLtoR( Buffer, "Panel_charset2" );
 
diff --git a/alliance/src/xpat/src/XMS_setup.c b/alliance/src/xpat/src/XMS_setup.c
index 3245e33d..45a92ef9 100644
--- a/alliance/src/xpat/src/XMS_setup.c
+++ b/alliance/src/xpat/src/XMS_setup.c
@@ -147,7 +147,7 @@ void XpatWriteTopLevelValues()
   Values[1] = Values[1] - XPAT_TOPLEVEL_TRANSLATE_Y;
   Values[4] = 1;
   
-  fprintf( FileConfig, "VERSION: %s\n", XPAT_VERSION );
+  fprintf( FileConfig, "VERSION: %s\n", VERSION );
   fprintf( FileConfig, "X: %d, Y: %d, WIDTH: %d, HEIGHT: %d, MANAGED: %d\n",
            Values[0], Values[1], Values[2], Values[3], Values[4] );
 
@@ -234,7 +234,7 @@ char XpatReadTopLevelValues()
 
   fscanf( FileConfig, "VERSION: %s\n", Version );
 
-  if ( strcmp( Version, XPAT_VERSION ) )
+  if ( strcmp( Version, VERSION ) )
   {
     autend();
     return( 0 );
diff --git a/alliance/src/xpat/src/XPT_error.c b/alliance/src/xpat/src/XPT_error.c
index 74292deb..e90f3179 100644
--- a/alliance/src/xpat/src/XPT_error.c
+++ b/alliance/src/xpat/src/XPT_error.c
@@ -157,11 +157,11 @@ void XpatInitializeErrorMessage( Debug )
 
   if ( XpatNormalMode )
   {
-    sprintf( XpatOutFileName, "/tmp/%s_out_%d", XPAT_TOOL_NAME, getpid() ); 
+    sprintf( XpatOutFileName, "/tmp/%s_out_%d", PACKAGE, getpid() ); 
   }
 
-  sprintf( XpatErrFileName, "/tmp/%s_err_%d", XPAT_TOOL_NAME, getpid() );
-  sprintf( XpatAllFileName, "/tmp/%s_all_%d", XPAT_TOOL_NAME, getpid() );
+  sprintf( XpatErrFileName, "/tmp/%s_err_%d", PACKAGE, getpid() );
+  sprintf( XpatAllFileName, "/tmp/%s_all_%d", PACKAGE, getpid() );
 
   XpatStreamErr = freopen( XpatErrFileName, "w+", stderr);
   XpatStreamAll = fopen  ( XpatAllFileName, "w+"        );
diff --git a/alliance/src/xpat/src/xpat.c b/alliance/src/xpat/src/xpat.c
index 3d676958..bb148241 100644
--- a/alliance/src/xpat/src/xpat.c
+++ b/alliance/src/xpat/src/xpat.c
@@ -85,7 +85,7 @@
 
 void XpatPresent()
 {
-  alliancebanner_with_contrib( "Xpat", XPAT_VERSION,
+  alliancebanner_with_contrib( "Xpat", VERSION,
                   "Graphic Pattern Viewer", "1999",
                   ALLIANCE_VERSION, "Ludovic Jacomme", "Julien Dunoyer" );
 }
diff --git a/alliance/src/xsch/configure.in b/alliance/src/xsch/configure.in
index cb4068de..f48a7ba1 100644
--- a/alliance/src/xsch/configure.in
+++ b/alliance/src/xsch/configure.in
@@ -24,6 +24,8 @@ AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 AC_FIND_MOTIF
 
+AC_CHECK_LIB(m, cos)
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
diff --git a/alliance/src/xsch/src/Makefile.am b/alliance/src/xsch/src/Makefile.am
index eea43f22..7e64e252 100644
--- a/alliance/src/xsch/src/Makefile.am
+++ b/alliance/src/xsch/src/Makefile.am
@@ -1,14 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xsch
-CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXSCH_VERSION=\"@XSCH_VERSION@\" \
-         -DXSCH_TOOL_NAME=\"xsch\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
 	 -DXSCH_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xsch.par\" \
 	 -DXMS_FILE_NAME=\".xsch.cfg\"
 
 xsch_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
    -lScl -lMlu -lMal -lMcl -lMel -lMhl -lMsl -lMvl -lMgl -lMlo -lMut -lMgl -lAbv -lAbe \
-   -lBdd -lAbl -lAut -lRcn -lm
+   -lBdd -lAbl -lAut -lRcn
 
 INCLUDES = @INCLUDE_MOTIF@
 
diff --git a/alliance/src/xsch/src/XMH_panel.c b/alliance/src/xsch/src/XMH_panel.c
index dec1095e..918f3f01 100644
--- a/alliance/src/xsch/src/XMH_panel.c
+++ b/alliance/src/xsch/src/XMH_panel.c
@@ -260,7 +260,7 @@ void XschBuildPresentPanel()
                  XmNactivateCallback,
                  XschExitDialogCallback, NULL );
 
-  sprintf( Buffer, "\nGraphic Schematic Viewer\nVersion %s", XSCH_VERSION );
+  sprintf( Buffer, "\nGraphic Schematic Viewer\nVersion %s", VERSION );
 
   PanelString = XmStringCreateLtoR( Buffer, "Panel_charset2" );
 
diff --git a/alliance/src/xsch/src/XMS_setup.c b/alliance/src/xsch/src/XMS_setup.c
index 5f93c756..1afd3aab 100644
--- a/alliance/src/xsch/src/XMS_setup.c
+++ b/alliance/src/xsch/src/XMS_setup.c
@@ -147,7 +147,7 @@ void XschWriteTopLevelValues()
   Values[1] = Values[1] - XSCH_TOPLEVEL_TRANSLATE_Y;
   Values[4] = 1;
   
-  fprintf( FileConfig, "VERSION: %s\n", XSCH_VERSION );
+  fprintf( FileConfig, "VERSION: %s\n", VERSION );
   fprintf( FileConfig, "X: %d, Y: %d, WIDTH: %d, HEIGHT: %d, MANAGED: %d\n",
            Values[0], Values[1], Values[2], Values[3], Values[4] );
 
@@ -234,7 +234,7 @@ char XschReadTopLevelValues()
 
   fscanf( FileConfig, "VERSION: %s\n", Version );
 
-  if ( strcmp( Version, XSCH_VERSION ) )
+  if ( strcmp( Version, VERSION ) )
   {
     autend();
     return( 0 );
diff --git a/alliance/src/xsch/src/XSC_error.c b/alliance/src/xsch/src/XSC_error.c
index 70168e65..5f292731 100644
--- a/alliance/src/xsch/src/XSC_error.c
+++ b/alliance/src/xsch/src/XSC_error.c
@@ -157,11 +157,11 @@ void XschInitializeErrorMessage( Debug )
 
   if ( XschNormalMode )
   {
-    sprintf( XschOutFileName, "/tmp/%s_out_%d", XSCH_TOOL_NAME, getpid() ); 
+    sprintf( XschOutFileName, "/tmp/%s_out_%d", PACKAGE, getpid() ); 
   }
 
-  sprintf( XschErrFileName, "/tmp/%s_err_%d", XSCH_TOOL_NAME, getpid() );
-  sprintf( XschAllFileName, "/tmp/%s_all_%d", XSCH_TOOL_NAME, getpid() );
+  sprintf( XschErrFileName, "/tmp/%s_err_%d", PACKAGE, getpid() );
+  sprintf( XschAllFileName, "/tmp/%s_all_%d", PACKAGE, getpid() );
 
   XschStreamErr = freopen( XschErrFileName, "w+", stderr);
   XschStreamAll = fopen  ( XschAllFileName, "w+"        );
diff --git a/alliance/src/xsch/src/xsch.c b/alliance/src/xsch/src/xsch.c
index 5df02bbc..d36b476d 100644
--- a/alliance/src/xsch/src/xsch.c
+++ b/alliance/src/xsch/src/xsch.c
@@ -85,7 +85,7 @@
 
 void XschPresent()
 {
-  alliancebanner_with_contrib( "Xsch", XSCH_VERSION,
+  alliancebanner_with_contrib( "Xsch", VERSION,
                   "Graphical Schematic Viewer", "2000",
                   ALLIANCE_VERSION, "Ludovic Jacomme",
                   "B.Miramond, F.Petrot, S.Picault" );
diff --git a/alliance/src/xvpn/src/Makefile.am b/alliance/src/xvpn/src/Makefile.am
index 807a732c..74ebdc96 100644
--- a/alliance/src/xvpn/src/Makefile.am
+++ b/alliance/src/xvpn/src/Makefile.am
@@ -1,13 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xvpn
-CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXVPN_VERSION=\"@XVPN_VERSION@\" \
-         -DXVPN_TOOL_NAME=\"xvpn\" \
+AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
 	 -DXVPN_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xvpn.par\" \
 	 -DXMS_FILE_NAME=\".xvpn.cfg\"
 
 xvpn_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
- -lVtl -lVvh -lVpd -lVpn -lVbl -lVbh -lVex -lAbl -lAut -lMut -lm
+ -lVtl -lVvh -lVpd -lVpn -lVbl -lVbh -lVex -lAbl -lAut -lMut
 
 INCLUDES = @INCLUDE_MOTIF@
 
diff --git a/alliance/src/xvpn/src/XMH_panel.c b/alliance/src/xvpn/src/XMH_panel.c
index 9d79e4d5..93389e47 100644
--- a/alliance/src/xvpn/src/XMH_panel.c
+++ b/alliance/src/xvpn/src/XMH_panel.c
@@ -259,7 +259,7 @@ void XvpnBuildPresentPanel()
                  XmNactivateCallback,
                  XvpnExitDialogCallback, NULL );
 
-  sprintf( Buffer, "\nGraphic Petri Nets Viewer\nVersion %s", XVPN_VERSION );
+  sprintf( Buffer, "\nGraphic Petri Nets Viewer\nVersion %s", VERSION );
 
   PanelString = XmStringCreateLtoR( Buffer, "Panel_charset2" );
 
diff --git a/alliance/src/xvpn/src/XMS_setup.c b/alliance/src/xvpn/src/XMS_setup.c
index 9450ad29..11b220a5 100644
--- a/alliance/src/xvpn/src/XMS_setup.c
+++ b/alliance/src/xvpn/src/XMS_setup.c
@@ -146,7 +146,7 @@ void XvpnWriteTopLevelValues()
   Values[1] = Values[1] - XVPN_TOPLEVEL_TRANSLATE_Y;
   Values[4] = 1;
   
-  fprintf( FileConfig, "VERSION: %s\n", XVPN_VERSION );
+  fprintf( FileConfig, "VERSION: %s\n", VERSION );
   fprintf( FileConfig, "X: %d, Y: %d, WIDTH: %d, HEIGHT: %d, MANAGED: %d\n",
            Values[0], Values[1], Values[2], Values[3], Values[4] );
 
@@ -233,7 +233,7 @@ short XvpnReadTopLevelValues()
 
   fscanf( FileConfig, "VERSION: %s\n", Version );
 
-  if ( strcmp( Version, XVPN_VERSION ) )
+  if ( strcmp( Version, VERSION ) )
   {
     autend();
     return( 0 );
diff --git a/alliance/src/xvpn/src/XVP_error.c b/alliance/src/xvpn/src/XVP_error.c
index fa6faed1..c29c5bcd 100644
--- a/alliance/src/xvpn/src/XVP_error.c
+++ b/alliance/src/xvpn/src/XVP_error.c
@@ -159,11 +159,11 @@ void XvpnInitializeErrorMessage( Debug )
 
   if ( XvpnNormalMode )
   {
-    sprintf( XvpnOutFileName, "/tmp/%s_out_%d", XVPN_TOOL_NAME, (int)getpid() ); 
+    sprintf( XvpnOutFileName, "/tmp/%s_out_%d", PACKAGE, (int)getpid() ); 
   }
 
-  sprintf( XvpnErrFileName, "/tmp/%s_err_%d", XVPN_TOOL_NAME, (int)getpid() );
-  sprintf( XvpnAllFileName, "/tmp/%s_all_%d", XVPN_TOOL_NAME, (int)getpid() );
+  sprintf( XvpnErrFileName, "/tmp/%s_err_%d", PACKAGE, (int)getpid() );
+  sprintf( XvpnAllFileName, "/tmp/%s_all_%d", PACKAGE, (int)getpid() );
 
   XvpnStreamErr = freopen( XvpnErrFileName, "w+", stderr);
   XvpnStreamAll = fopen  ( XvpnAllFileName, "w+"        );
diff --git a/alliance/src/xvpn/src/xvpn.c b/alliance/src/xvpn/src/xvpn.c
index 4bea22d8..720ffbd8 100644
--- a/alliance/src/xvpn/src/xvpn.c
+++ b/alliance/src/xvpn/src/xvpn.c
@@ -87,7 +87,7 @@
 
 void XvpnPresent()
 {
-  alliancebanner_with_authors( "Xvpn", XVPN_VERSION,
+  alliancebanner_with_authors( "Xvpn", VERSION,
                   "Graphic Petri Nets Viewer", "1996",
                   ALLIANCE_VERSION, "Ludovic Jacomme" );
 }