diff --git a/alliance/src/abe/src/Makefile.am b/alliance/src/abe/src/Makefile.am
index e0d4ebf1..cd64454f 100644
--- a/alliance/src/abe/src/Makefile.am
+++ b/alliance/src/abe/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libAbe.a
 include_HEADERS     = abe.h
diff --git a/alliance/src/abl/src/Makefile.am b/alliance/src/abl/src/Makefile.am
index ec80ce31..413162d8 100644
--- a/alliance/src/abl/src/Makefile.am
+++ b/alliance/src/abl/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libAbl.a
 include_HEADERS     = abl.h
diff --git a/alliance/src/abt/src/Makefile.am b/alliance/src/abt/src/Makefile.am
index fd9ce4fb..8508ac13 100644
--- a/alliance/src/abt/src/Makefile.am
+++ b/alliance/src/abt/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libAbt.a
 include_HEADERS     = abt.h
diff --git a/alliance/src/abv/src/Makefile.am b/alliance/src/abv/src/Makefile.am
index fbe49c96..017f9046 100644
--- a/alliance/src/abv/src/Makefile.am
+++ b/alliance/src/abv/src/Makefile.am
@@ -1,3 +1,5 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libAbv.a
 include_HEADERS     = abv.h
 libAbv_a_SOURCES    = bvl_bcomp_y.y bvl_bcomp_l.l \
diff --git a/alliance/src/alliance.m4 b/alliance/src/alliance.m4
index df565d0e..d7fbd068 100644
--- a/alliance/src/alliance.m4
+++ b/alliance/src/alliance.m4
@@ -6,17 +6,17 @@ AC_DEFUN(AM_ALLIANCE,[
 
 AC_MSG_CHECKING(for alliance)
 if test x$alliance_prefix != x ; then
-  ALLIANCE_CFLAGS="-I$alliance_prefix/include"
-  ALLIANCE_LIBS="-L$alliance_prefix/lib"
+  ALC_CFLAGS="-I$alliance_prefix/include"
+  ALC_LIBS="-L$alliance_prefix/lib"
 else
-  ALLIANCE_CFLAGS="-I${ALLIANCE_TOP}/include"
-  ALLIANCE_LIBS="-L${ALLIANCE_TOP}/lib"
+  ALC_CFLAGS="-I${ALLIANCE_TOP}/include $CFLAGS"
+  ALC_LIBS="-L${ALLIANCE_TOP}/lib $LIBS"
 fi
 
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
-CFLAGS="$ALLIANCE_CFLAGS $CFLAGS"
-LIBS="$ALLIANCE_LIBS -lMut $LIBS"
+CFLAGS="$ALC_CFLAGS $CFLAGS"
+LIBS="$ALC_LIBS -lMut $LIBS"
 
 AC_TRY_RUN([
 #include <mut.h>
@@ -44,15 +44,13 @@ LIBS="$ac_save_LIBS"
 dnl ifelse([$2], , :, [$2])
   fi
   
-dnl the following lines should disapear in the future 
-CFLAGS="$ALLIANCE_CFLAGS $CFLAGS"
-LIBS="$ALLIANCE_LIBS $LIBS"
-CXXFLAGS="$ALLIANCE_CFLAGS $CXXFLAGS"
-AC_SUBST(CFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(LIBS)
-dnl end of to delete lines
+CFLAGS="$ALC_CFLAGS $CFLAGS"
+LIBS="$ALC_LIBS $LIBS"
+ALLIANCE_CFLAGS=$CFLAGS
+ALLIANCE_LIBS=$LIBS
 
+AC_SUBST(CFLAGS)
+AC_SUBST(LIBS)
 AC_SUBST(ALLIANCE_CFLAGS)
 AC_SUBST(ALLIANCE_LIBS)
 
diff --git a/alliance/src/aut/src/Makefile.am b/alliance/src/aut/src/Makefile.am
index 3079c3f6..3e7db92e 100644
--- a/alliance/src/aut/src/Makefile.am
+++ b/alliance/src/aut/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libAut.a
 include_HEADERS     = aut.h
diff --git a/alliance/src/b2f/src/Makefile.am b/alliance/src/b2f/src/Makefile.am
index e30e4a4c..c6dcf75f 100644
--- a/alliance/src/b2f/src/Makefile.am
+++ b/alliance/src/b2f/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = b2f
 
-CFLAGS = @CFLAGS@ -DB2F_VERSION=\"@B2F_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DB2F_VERSION=\"@B2F_VERSION@\"
 
-b2f_LDADD = @LIBS@ \
+b2f_LDADD = @ALLIANCE_LIBS@ \
           -lAbt -lAbv -lAbe -lFtl -lFks -lFvh -lFsm \
 	  -lBtr -lBdd -lAbl -lAut -lMut
 
diff --git a/alliance/src/bdd/src/Makefile.am b/alliance/src/bdd/src/Makefile.am
index 620bfd62..6e429ef1 100644
--- a/alliance/src/bdd/src/Makefile.am
+++ b/alliance/src/bdd/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libBdd.a
 include_HEADERS     = bdd.h
diff --git a/alliance/src/boog/src/Makefile.am b/alliance/src/boog/src/Makefile.am
index b52adc17..70926acb 100644
--- a/alliance/src/boog/src/Makefile.am
+++ b/alliance/src/boog/src/Makefile.am
@@ -1,8 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+CFLAGS = @ALLIANCE_CFLAGS@ \
+         -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+
 bin_PROGRAMS = boog
 
-boog_LDADD = @LIBS@ \
+boog_LDADD = @ALLIANCE_LIBS@ \
           -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvl -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   
 boog_SOURCES = \
diff --git a/alliance/src/boom/src/Makefile.am b/alliance/src/boom/src/Makefile.am
index 9e134cc3..2a99d627 100644
--- a/alliance/src/boom/src/Makefile.am
+++ b/alliance/src/boom/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = boom
 
-CFLAGS = @CFLAGS@ -DBOOM_VERSION=\"@BOOM_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DBOOM_VERSION=\"@BOOM_VERSION@\"
 
-boom_LDADD = @LIBS@ \
+boom_LDADD = @ALLIANCE_LIBS@ \
           -lAbv -lAbe -lAbt -lBdd -lAbl -lAut -lMut -lm
 
 boom_SOURCES = \
diff --git a/alliance/src/btr/src/Makefile.am b/alliance/src/btr/src/Makefile.am
index 50a3bb9b..2e3a7594 100644
--- a/alliance/src/btr/src/Makefile.am
+++ b/alliance/src/btr/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libBtr.a
 include_HEADERS     = btr.h
diff --git a/alliance/src/dreal/src/Makefile.am b/alliance/src/dreal/src/Makefile.am
index 6ea20602..ad7584d7 100644
--- a/alliance/src/dreal/src/Makefile.am
+++ b/alliance/src/dreal/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = dreal
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDREAL_VERSION=\"@DREAL_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DDREAL_VERSION=\"@DREAL_VERSION@\" \
          -DDREAL_TOOL_NAME=\"dreal\" \
          -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" \
          -DDREAL_DEFAULT_TECHNO_NAME=\"etc/cmos_7.dreal\" \
@@ -12,7 +12,7 @@ CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDREAL_VERSION=\"@DREAL_VERSION@\" \
          -DDREAL_WINDOW_YMIN=\"DREAL_WINDOW_YMIN\" \
          -DDREAL_WINDOW_SIDE=\"DREAL_WINDOW_SIDE\" 
 
-dreal_LDADD = @LIBS@ @X_LIBS@ @LINK_MOTIF@ \
+dreal_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
 -lRtl -lRgs -lRcf -lRut -lRfm -lRpr -lRds -lMpu -lMap -lMmg -lMcp -lMph -lMut
 
 
diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am
index 11bd3f2b..243689c4 100644
--- a/alliance/src/druc/src/Makefile.am
+++ b/alliance/src/druc/src/Makefile.am
@@ -18,9 +18,9 @@ drucompi_l.c : $(srcdir)/drucompi_l.l drucompi_y.h
 
 bin_PROGRAMS = druc
 
-CFLAGS = @CFLAGS@ -DBOOM_VERSION=\"@BOOM_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DBOOM_VERSION=\"@BOOM_VERSION@\"
 
-druc_LDADD = @LIBS@ \
+druc_LDADD = @ALLIANCE_LIBS@ \
 -L. -lVrd -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu -lMcp -lMap -lMmg -lMph \
 -lMut -lm
 
diff --git a/alliance/src/fks/src/Makefile.am b/alliance/src/fks/src/Makefile.am
index 68865ebf..c1dbd71c 100644
--- a/alliance/src/fks/src/Makefile.am
+++ b/alliance/src/fks/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libFks.a
 include_HEADERS     = fks.h
diff --git a/alliance/src/flatbeh/src/Makefile.am b/alliance/src/flatbeh/src/Makefile.am
index 968f6d8c..4f5b679e 100644
--- a/alliance/src/flatbeh/src/Makefile.am
+++ b/alliance/src/flatbeh/src/Makefile.am
@@ -1,8 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+
 bin_PROGRAMS = flatbeh
 
-flatbeh_LDADD = @LIBS@ \
+flatbeh_LDADD = @ALLIANCE_LIBS@ \
           -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvl -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   
 flatbeh_SOURCES = abstract.c abstract.h utils.c utils.h main.c
diff --git a/alliance/src/fmi/src/Makefile.am b/alliance/src/fmi/src/Makefile.am
index c491f517..bcea1c8b 100644
--- a/alliance/src/fmi/src/Makefile.am
+++ b/alliance/src/fmi/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = fmi
 
-CFLAGS = @CFLAGS@ -DFMI_VERSION=\"@FMI_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DFMI_VERSION=\"@FMI_VERSION@\"
 
-fmi_LDADD = @LIBS@ \
+fmi_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
 
diff --git a/alliance/src/fsm/src/Makefile.am b/alliance/src/fsm/src/Makefile.am
index 614ece05..864a12ee 100644
--- a/alliance/src/fsm/src/Makefile.am
+++ b/alliance/src/fsm/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libFsm.a
 include_HEADERS     = fsm.h
diff --git a/alliance/src/fsp/src/Makefile.am b/alliance/src/fsp/src/Makefile.am
index e6d11175..e273f708 100644
--- a/alliance/src/fsp/src/Makefile.am
+++ b/alliance/src/fsp/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = fsp
 
-CFLAGS = @CFLAGS@ -DFSP_VERSION=\"@FSP_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DFSP_VERSION=\"@FSP_VERSION@\"
 
-fsp_LDADD = @LIBS@ \
+fsp_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
 
diff --git a/alliance/src/ftl/src/Makefile.am b/alliance/src/ftl/src/Makefile.am
index ff1ffc9c..3d1215c4 100644
--- a/alliance/src/ftl/src/Makefile.am
+++ b/alliance/src/ftl/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libFtl.a
 include_HEADERS     = ftl.h
diff --git a/alliance/src/fvh/src/Makefile.am b/alliance/src/fvh/src/Makefile.am
index b5337073..b87fd283 100644
--- a/alliance/src/fvh/src/Makefile.am
+++ b/alliance/src/fvh/src/Makefile.am
@@ -1,3 +1,5 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 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 9a0935d7..8d4104bb 100644
--- a/alliance/src/gcp/src/Makefile.am
+++ b/alliance/src/gcp/src/Makefile.am
@@ -1,3 +1,5 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 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 162a5c16..7fb0154b 100644
--- a/alliance/src/genlib/src/Makefile.am
+++ b/alliance/src/genlib/src/Makefile.am
@@ -1,3 +1,5 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libMgn.a
 include_HEADERS     = mgn.h mbkgen.h genlib.h
 libMgn_a_SOURCES    = genlib.c
diff --git a/alliance/src/graal/src/Makefile.am b/alliance/src/graal/src/Makefile.am
index 7239dc85..a24f8a98 100644
--- a/alliance/src/graal/src/Makefile.am
+++ b/alliance/src/graal/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = graal
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -DGRAAL_VERSION=\"@GRAAL_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DGRAAL_VERSION=\"@GRAAL_VERSION@\" \
          -DGRAAL_TOOL_NAME=\"graal\" \
          -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" \
          -DGRAAL_DEFAULT_TECHNO_NAME=\"etc/cmos_12.graal\" \
@@ -12,7 +12,7 @@ CFLAGS = @CFLAGS@ @X_CFLAGS@ -DGRAAL_VERSION=\"@GRAAL_VERSION@\" \
          -DGRAAL_WINDOW_YMIN=\"GRAAL_WINDOW_YMIN\" \
          -DGRAAL_WINDOW_SIDE=\"GRAAL_WINDOW_SIDE\" 
 
-graal_LDADD = @LIBS@ @X_LIBS@ @LINK_MOTIF@ \
+graal_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
 -lVrd -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu \
 -lMap -lMmg -lMcp -lMph -lMut -lm
 
diff --git a/alliance/src/k2f/src/Makefile.am b/alliance/src/k2f/src/Makefile.am
index ef75b1ce..9f0ddc9f 100644
--- a/alliance/src/k2f/src/Makefile.am
+++ b/alliance/src/k2f/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = k2f
 
-CFLAGS = @CFLAGS@ -DK2F_VERSION=\"@K2F_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DK2F_VERSION=\"@K2F_VERSION@\"
 
-k2f_LDADD = @LIBS@ \
+k2f_LDADD = @ALLIANCE_LIBS@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
 
diff --git a/alliance/src/l2p/src/Makefile.am b/alliance/src/l2p/src/Makefile.am
index df65f0b8..625e3ac9 100644
--- a/alliance/src/l2p/src/Makefile.am
+++ b/alliance/src/l2p/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = l2p
 
-CFLAGS = @CFLAGS@ -DL2P_VERSION=\"@L2P_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DL2P_VERSION=\"@L2P_VERSION@\"
 
-l2p_LDADD = @LIBS@ \
+l2p_LDADD = @ALLIANCE_LIBS@ \
  -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
  -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
  -lMsl -lMgl \
diff --git a/alliance/src/log/src/Makefile.am b/alliance/src/log/src/Makefile.am
index 739b9da8..1d6df377 100644
--- a/alliance/src/log/src/Makefile.am
+++ b/alliance/src/log/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libLog.a
 include_HEADERS     = log.h
diff --git a/alliance/src/loon/src/Makefile.am b/alliance/src/loon/src/Makefile.am
index f51e1a7b..3b99c76e 100644
--- a/alliance/src/loon/src/Makefile.am
+++ b/alliance/src/loon/src/Makefile.am
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = loon
 
-loon_LDADD = @LIBS@ \
+loon_LDADD = @ALLIANCE_LIBS@ \
           -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvl -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   
 loon_SOURCES = \
diff --git a/alliance/src/lynx/src/Makefile.am b/alliance/src/lynx/src/Makefile.am
index 5fc88f44..316289a3 100644
--- a/alliance/src/lynx/src/Makefile.am
+++ b/alliance/src/lynx/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = lynx flatrds
 
-CFLAGS = @CFLAGS@ -DLYNX_VERSION=\"@LYNX_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DLYNX_VERSION=\"@LYNX_VERSION@\"
 
-lynx_LDADD = @LIBS@ \
+lynx_LDADD = @ALLIANCE_LIBS@ \
  -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
  -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
  -lMsl -lMgl \
diff --git a/alliance/src/mbk/src/Makefile.am b/alliance/src/mbk/src/Makefile.am
index bf66a0b9..031fc273 100644
--- a/alliance/src/mbk/src/Makefile.am
+++ b/alliance/src/mbk/src/Makefile.am
@@ -1,3 +1,4 @@
+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 09c56271..0e2e2791 100644
--- a/alliance/src/mbkal/src/Makefile.am
+++ b/alliance/src/mbkal/src/Makefile.am
@@ -1,2 +1,3 @@
+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 3e3812e1..37d26f0c 100644
--- a/alliance/src/mbkap/src/Makefile.am
+++ b/alliance/src/mbkap/src/Makefile.am
@@ -1,2 +1,3 @@
+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 2b1f034b..611bcbef 100644
--- a/alliance/src/mbkedif/src/Makefile.am
+++ b/alliance/src/mbkedif/src/Makefile.am
@@ -1,3 +1,4 @@
+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 20c95f0e..3dc0eb19 100644
--- a/alliance/src/mbkhilo/src/Makefile.am
+++ b/alliance/src/mbkhilo/src/Makefile.am
@@ -1,2 +1,3 @@
+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 3638e44f..a81aea74 100644
--- a/alliance/src/mbkmg/src/Makefile.am
+++ b/alliance/src/mbkmg/src/Makefile.am
@@ -1,3 +1,4 @@
+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 6a717cd5..d981d485 100644
--- a/alliance/src/mbkspice/src/Makefile.am
+++ b/alliance/src/mbkspice/src/Makefile.am
@@ -1,3 +1,4 @@
+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 e5ca6ef5..83b7e2c4 100644
--- a/alliance/src/mbkvrlog/src/Makefile.am
+++ b/alliance/src/mbkvrlog/src/Makefile.am
@@ -1,2 +1,3 @@
+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 4efd4fd7..0a7cea55 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              = @CFLAGS@ -DTECHNO=\"symbolic_cmos\"
+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/pat/src/Makefile.am b/alliance/src/pat/src/Makefile.am
index 4d38d905..8fdf4be6 100644
--- a/alliance/src/pat/src/Makefile.am
+++ b/alliance/src/pat/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libPat.a
 include_HEADERS     = pat.h
diff --git a/alliance/src/phl/src/Makefile.am b/alliance/src/phl/src/Makefile.am
index 0d411703..916d3f7b 100644
--- a/alliance/src/phl/src/Makefile.am
+++ b/alliance/src/phl/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libPhl.a
 include_HEADERS     = phl.h
diff --git a/alliance/src/ppt/src/Makefile.am b/alliance/src/ppt/src/Makefile.am
index 27a377fc..82b8d0d9 100644
--- a/alliance/src/ppt/src/Makefile.am
+++ b/alliance/src/ppt/src/Makefile.am
@@ -1,3 +1,6 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+
 lib_LIBRARIES       = libPpt.a
 include_HEADERS     = ppt.h
 libPpt_a_SOURCES    = pat_decl_l.l pat_decl_y.y pat_desc_l.l pat_desc_y.y\
diff --git a/alliance/src/rds/src/Makefile.am b/alliance/src/rds/src/Makefile.am
index f699f256..a71f0eb0 100644
--- a/alliance/src/rds/src/Makefile.am
+++ b/alliance/src/rds/src/Makefile.am
@@ -4,7 +4,7 @@ lib_LIBRARIES       = libRds.a \
                       libRpr.a \
                       libRwi.a \
                       libRtl.a
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DRTL_DEFAULT_TECHNO=\"etc/cmos_12.rds\" \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 
diff --git a/alliance/src/rdscif/src/Makefile.am b/alliance/src/rdscif/src/Makefile.am
index a23e34ec..6c338f5a 100644
--- a/alliance/src/rdscif/src/Makefile.am
+++ b/alliance/src/rdscif/src/Makefile.am
@@ -1,2 +1,5 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
+
 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 3e0a33fd..85d3c49c 100644
--- a/alliance/src/rdsgds/src/Makefile.am
+++ b/alliance/src/rdsgds/src/Makefile.am
@@ -1,2 +1,4 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 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/rtd/src/Makefile.am b/alliance/src/rtd/src/Makefile.am
index 0c634004..55d0516c 100644
--- a/alliance/src/rtd/src/Makefile.am
+++ b/alliance/src/rtd/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libRtd.a
 include_HEADERS     = rtd.h
diff --git a/alliance/src/rtn/src/Makefile.am b/alliance/src/rtn/src/Makefile.am
index 393269b4..c68d569c 100644
--- a/alliance/src/rtn/src/Makefile.am
+++ b/alliance/src/rtn/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libRtn.a
 include_HEADERS     = rtn.h
diff --git a/alliance/src/scapin/src/Makefile.am b/alliance/src/scapin/src/Makefile.am
index a6f57af4..40b056fd 100644
--- a/alliance/src/scapin/src/Makefile.am
+++ b/alliance/src/scapin/src/Makefile.am
@@ -2,11 +2,11 @@
 
 bin_PROGRAMS = scapin
 
-CFLAGS = @CFLAGS@ -DSCAPIN_VERSION=\"@SCAPIN_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ -DSCAPIN_VERSION=\"@SCAPIN_VERSION@\" \
          -DALLIANCE_TOP=\"${ALLIANCE_TOP}\" \
          -DSCAPIN_DEFAULT_PARAM_NAME=\"etc/sxlib.scapin\"
 
-scapin_LDADD = @LIBS@ \
+scapin_LDADD = @ALLIANCE_LIBS@ \
 -lMlu -lMcl -lMel -lMhl -lMvl -lMlo -lMut -lMal -lRcn -lMsl -lMgl -lAut
 
 scapin_SOURCES = \
diff --git a/alliance/src/scl/src/Makefile.am b/alliance/src/scl/src/Makefile.am
index 323d88b5..34b3d148 100644
--- a/alliance/src/scl/src/Makefile.am
+++ b/alliance/src/scl/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libScl.a
 include_HEADERS     = scl.h
diff --git a/alliance/src/syf/src/Makefile.am b/alliance/src/syf/src/Makefile.am
index 8dd41f45..9a4d9402 100644
--- a/alliance/src/syf/src/Makefile.am
+++ b/alliance/src/syf/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = syf
 
-CFLAGS = @CFLAGS@ -DSYF_VERSION=\"@SYF_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DSYF_VERSION=\"@SYF_VERSION@\"
 
-syf_LDADD = @LIBS@ \
+syf_LDADD = @ALLIANCE_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 2215e34b..e468835b 100644
--- a/alliance/src/vasy/src/Makefile.am
+++ b/alliance/src/vasy/src/Makefile.am
@@ -2,9 +2,9 @@
 
 bin_PROGRAMS = vasy
 
-CFLAGS = @CFLAGS@ -DVASY_VERSION=\"@VASY_VERSION@\"
+CFLAGS = @ALLIANCE_CFLAGS@ -DVASY_VERSION=\"@VASY_VERSION@\"
 
-vasy_LDADD = @LIBS@ \
+vasy_LDADD = @ALLIANCE_LIBS@ \
           -lRtd -lRtn -lVtl -lVvh -lVpd -lVpn -lVbl -lVbh \
 	  -lVex -lBdd -lAbl -lAut -lMut
 
diff --git a/alliance/src/vbh/src/Makefile.am b/alliance/src/vbh/src/Makefile.am
index 3ccc8819..36509f49 100644
--- a/alliance/src/vbh/src/Makefile.am
+++ b/alliance/src/vbh/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libVbh.a
 include_HEADERS     = vbh.h
diff --git a/alliance/src/vbl/src/Makefile.am b/alliance/src/vbl/src/Makefile.am
index 2210c258..5cd5c2f2 100644
--- a/alliance/src/vbl/src/Makefile.am
+++ b/alliance/src/vbl/src/Makefile.am
@@ -1,3 +1,5 @@
+CFLAGS              = @ALLIANCE_CFLAGS@ \
+                      -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 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 6cf04568..87f1ca03 100644
--- a/alliance/src/vex/src/Makefile.am
+++ b/alliance/src/vex/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libVex.a
 include_HEADERS     = vex.h
diff --git a/alliance/src/vpd/src/Makefile.am b/alliance/src/vpd/src/Makefile.am
index 1ab537ad..2f0b2796 100644
--- a/alliance/src/vpd/src/Makefile.am
+++ b/alliance/src/vpd/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libVpd.a
 include_HEADERS     = vpd.h
diff --git a/alliance/src/vpn/src/Makefile.am b/alliance/src/vpn/src/Makefile.am
index 3f757341..54edd4a2 100644
--- a/alliance/src/vpn/src/Makefile.am
+++ b/alliance/src/vpn/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libVpn.a
 include_HEADERS     = vpn.h
diff --git a/alliance/src/vtl/src/Makefile.am b/alliance/src/vtl/src/Makefile.am
index 6304068c..2d971600 100644
--- a/alliance/src/vtl/src/Makefile.am
+++ b/alliance/src/vtl/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libVtl.a
 include_HEADERS     = vtl.h
diff --git a/alliance/src/vvh/src/Makefile.am b/alliance/src/vvh/src/Makefile.am
index e6147556..3ed685a6 100644
--- a/alliance/src/vvh/src/Makefile.am
+++ b/alliance/src/vvh/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS              = @CFLAGS@ \
+CFLAGS              = @ALLIANCE_CFLAGS@ \
                       -DALLIANCE_TOP=\"${ALLIANCE_TOP}\"
 lib_LIBRARIES       = libVvh.a
 include_HEADERS     = vvh.h
diff --git a/alliance/src/xfsm/src/Makefile.am b/alliance/src/xfsm/src/Makefile.am
index 97d1057c..5a3d55dd 100644
--- a/alliance/src/xfsm/src/Makefile.am
+++ b/alliance/src/xfsm/src/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xfsm
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -DXFSM_VERSION=\"@XFSM_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXFSM_VERSION=\"@XFSM_VERSION@\" \
          -DXFSM_TOOL_NAME=\"xfsm\" \
 	 -DXFSM_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xfsm.par\" \
 	 -DXMS_FILE_NAME=\".xfsm.cfg\"
 
-xfsm_LDADD = @LIBS@ @X_LIBS@ @LINK_MOTIF@ \
+xfsm_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
           -lFtl -lFks -lFvh -lFsm \
 	  -lBdd -lAbl -lAut -lMut
 
diff --git a/alliance/src/xpat/src/Makefile.am b/alliance/src/xpat/src/Makefile.am
index 09740c13..c0782f05 100644
--- a/alliance/src/xpat/src/Makefile.am
+++ b/alliance/src/xpat/src/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xpat
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -DXPAT_VERSION=\"@XPAT_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXPAT_VERSION=\"@XPAT_VERSION@\" \
          -DXPAT_TOOL_NAME=\"xpat\" \
 	 -DXPAT_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xpat.par\" \
 	 -DXMS_FILE_NAME=\".xpat.cfg\"
 
-xpat_LDADD = @LIBS@ @X_LIBS@ @LINK_MOTIF@ \
+xpat_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
 	  -lPpt -lPhl -lPat -lAut -lMut
 
 INCLUDES = @INCLUDE_MOTIF@
diff --git a/alliance/src/xsch/src/Makefile.am b/alliance/src/xsch/src/Makefile.am
index dcda859d..eea43f22 100644
--- a/alliance/src/xsch/src/Makefile.am
+++ b/alliance/src/xsch/src/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xsch
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -DXSCH_VERSION=\"@XSCH_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXSCH_VERSION=\"@XSCH_VERSION@\" \
          -DXSCH_TOOL_NAME=\"xsch\" \
 	 -DXSCH_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xsch.par\" \
 	 -DXMS_FILE_NAME=\".xsch.cfg\"
 
-xsch_LDADD = @LIBS@ @X_LIBS@ @LINK_MOTIF@ \
+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
 
diff --git a/alliance/src/xvpn/src/Makefile.am b/alliance/src/xvpn/src/Makefile.am
index fdae63f5..807a732c 100644
--- a/alliance/src/xvpn/src/Makefile.am
+++ b/alliance/src/xvpn/src/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = xvpn
-CFLAGS = @CFLAGS@ @X_CFLAGS@ -DXVPN_VERSION=\"@XVPN_VERSION@\" \
+CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ -DXVPN_VERSION=\"@XVPN_VERSION@\" \
          -DXVPN_TOOL_NAME=\"xvpn\" \
 	 -DXVPN_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xvpn.par\" \
 	 -DXMS_FILE_NAME=\".xvpn.cfg\"
 
-xvpn_LDADD = @LIBS@ @X_LIBS@ @LINK_MOTIF@ \
+xvpn_LDADD = @ALLIANCE_LIBS@ @X_LIBS@ @LINK_MOTIF@ \
  -lVtl -lVvh -lVpd -lVpn -lVbl -lVbh -lVex -lAbl -lAut -lMut -lm
 
 INCLUDES = @INCLUDE_MOTIF@