Merge branch 'devel'

Conflicts:
	alliance/src/ocp/src/common/Makefile.am
	alliance/src/ocp/src/placer/Makefile.am
	alliance/src/ppt/src/Makefile.am

Devel was not started from the last master commit, have to
push back the changes again...

.gitignore

@@ -1,3 +1,5 @@
+cvsCommit.txt
+gitCommit.txt
 Linux.*/
 Darwin/
 Solaris/

alliance/src/abe/src/Makefile.am

@@ -1,8 +1,7 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src
-lib_LTLIBRARIES       = libAbe.la
+lib_LTLIBRARIES     = libAbe.la
 include_HEADERS     = abe.h
-libAbe_la_SOURCES    = \
-abe.h	   beh_del.c   beh_error.c  beh_getgenva.c  beh_rmv.c	   beh_view.c \
-beh_add.c  beh_dict.c  beh_fre.c    beh_message.c   beh_toolbug.c
-
-libAbe_la_LDFLAGS = -version-info @ABE_DLL_VERSION@
+libAbe_la_SOURCES   = abe.h	   beh_del.c   beh_error.c  beh_getgenva.c  beh_rmv.c	   beh_view.c \
+                      beh_add.c  beh_dict.c  beh_fre.c    beh_message.c   beh_toolbug.c
+libAbe_la_LDFLAGS   = -version-info @ABE_DLL_VERSION@
+libAbe_la_LIBADD    = -lAbl -lAut -lMut

alliance/src/abl/src/Makefile.am

@@ -1,16 +1,15 @@
 AM_CFLAGS            = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src
 lib_LTLIBRARIES      = libAbl.la
 include_HEADERS      = abl.h
-libAbl_la_SOURCES    = \
-abldel.h       ablflat.h      abloptim.h     ablunflat.h \
-abladd.c       abldev.c       ablfree.c      ablpolar.c     ablvhdl.c \
-abladd.h       abldev.h       ablfree.h      ablpolar.h     ablvhdl.h \
-ablcreate.c    abldup.c       ablget.c       ablsimp.c      ablview.c \
-ablcreate.h    abldup.h       ablget.h       ablsimp.h      ablview.h \
-ablctlnorm.c   ablenv.c       ablis.c        ablstr.c \
-ablctlnorm.h   ablenv.h       ablis.h        ablstr.h \
-ablctlsimp.c   ablerror.c     ablmap.c       ablsubst.c \
-ablctlsimp.h   ablerror.h     ablmap.h       ablsubst.h \
-abldel.c       ablflat.c      abloptim.c     ablunflat.c
-
-libAbl_la_LDFLAGS = -version-info @ABL_DLL_VERSION@
+libAbl_la_SOURCES    = abldel.h       ablflat.h      abloptim.h     ablunflat.h \
+                       abladd.c       abldev.c       ablfree.c      ablpolar.c     ablvhdl.c \
+                       abladd.h       abldev.h       ablfree.h      ablpolar.h     ablvhdl.h \
+                       ablcreate.c    abldup.c       ablget.c       ablsimp.c      ablview.c \
+                       ablcreate.h    abldup.h       ablget.h       ablsimp.h      ablview.h \
+                       ablctlnorm.c   ablenv.c       ablis.c        ablstr.c \
+                       ablctlnorm.h   ablenv.h       ablis.h        ablstr.h \
+                       ablctlsimp.c   ablerror.c     ablmap.c       ablsubst.c \
+                       ablctlsimp.h   ablerror.h     ablmap.h       ablsubst.h \
+                       abldel.c       ablflat.c      abloptim.c     ablunflat.c
+libAbl_la_LDFLAGS    = -version-info @ABL_DLL_VERSION@
+libAbl_la_LIBADD     = -lAut -lMut

alliance/src/abt/src/Makefile.am

@@ -1,10 +1,12 @@
-AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src \
--I$(top_srcdir)/abe/src
+AM_CFLAGS           = -I$(top_srcdir)/mbk/src \
+                      -I$(top_srcdir)/aut/src \
+                      -I$(top_srcdir)/abl/src \
+                      -I$(top_srcdir)/bdd/src \
+                      -I$(top_srcdir)/abe/src
 lib_LTLIBRARIES     = libAbt.la
 include_HEADERS     = abt.h
-libAbt_la_SOURCES   = \
-abt.h	      bhl_depend.c  bhl_freabl.c  bhl_makgex.c \
-bhl_delaux.c  bhl_error.c   bhl_makbdd.c  bhl_orderbdd.c \
-bhl_delaux.h  bhl_error.h   bhl_makbdd.h  bhl_orderbdd.h
-
-libAbt_la_LDFLAGS = -version-info @ABT_DLL_VERSION@
+libAbt_la_SOURCES   = abt.h	      bhl_depend.c  bhl_freabl.c  bhl_makgex.c \
+                      bhl_delaux.c  bhl_error.c   bhl_makbdd.c  bhl_orderbdd.c \
+                      bhl_delaux.h  bhl_error.h   bhl_makbdd.h  bhl_orderbdd.h
+libAbt_la_LDFLAGS   = -version-info @ABT_DLL_VERSION@
+libAbt_la_LIBADD    = -lBdd -lAbe -lAbl -lAut -lMut

alliance/src/abv/src/Makefile.am

@@ -1,13 +1,19 @@
-AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src \
--I$(top_srcdir)/abe/src
+AM_CFLAGS           = -I$(top_srcdir)/mbk/src \
+                      -I$(top_srcdir)/aut/src \
+                      -I$(top_srcdir)/abl/src \
+                      -I$(top_srcdir)/bdd/src \
+                      -I$(top_srcdir)/abe/src
 lib_LTLIBRARIES     = libAbv.la
 include_HEADERS     = abv.h
 libAbv_la_SOURCES   = bvl_bcomp_y.y bvl_bcomp_l.l \
-abv.h	     bvl_bspec.c  bvl_drive.c  bvl_parse.h  bvl_util.h \
-bvl_bedef.h  bvl_bspec.h  bvl_drive.h  bvl_utdef.h  bvl_utype.h \
-bvl_blex.h   bvl_byacc.h  bvl_parse.c  bvl_util.c
+                      abv.h	     bvl_bspec.c  bvl_drive.c  bvl_parse.h  bvl_util.h \
+                      bvl_bedef.h  bvl_bspec.h  bvl_drive.h  bvl_utdef.h  bvl_utype.h \
+                      bvl_blex.h   bvl_byacc.h  bvl_parse.c  bvl_util.c
+libAbv_la_LIBADD    = -lAbe -lBdd -lMut
+
 CLEANFILES          = bvl_bcomp_y.c bvl_bcomp_y.h bvl_bcomp_l.c
 
+
 bvl_bcomp_y.c bvl_bcomp_y.h : $(srcdir)/bvl_bcomp_y.y
 	$(YACC) -d $(YFLAGS) $(srcdir)/bvl_bcomp_y.y && sed -e "s/yy/bvl_y_/g" -e "s/YY/BVL_Y_/g" y.tab.c > bvl_bcomp_y.c && sed -e "s/yy/bvl_y_/g" -e "s/YY/BVL_Y_/g" y.tab.h > bvl_bcomp_y.h
 

alliance/src/asimut/src/Makefile.am

@@ -1,59 +1,38 @@
-AM_CFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/log/src -I$(top_srcdir)/beh/src -I$(top_srcdir)/pat/src \
--I$(top_srcdir)/bhl/src -I$(top_srcdir)/bvl/src -I$(top_srcdir)/ppt/src -I$(top_srcdir)/mlu/src
+AM_CFLAGS = -I$(top_srcdir)/mbk/src \
+            -I$(top_srcdir)/log/src \
+            -I$(top_srcdir)/beh/src \
+            -I$(top_srcdir)/pat/src \
+            -I$(top_srcdir)/bhl/src \
+            -I$(top_srcdir)/bvl/src \
+            -I$(top_srcdir)/ppt/src \
+            -I$(top_srcdir)/mlu/src
 
-lib_LTLIBRARIES       = libCst.la libSch.la
-include_HEADERS     = cst.h sch.h
+lib_LTLIBRARIES   = libSch.la
+include_HEADERS   = sch.h
 
-libCst_la_SOURCES    =  \
-cst_AddSetElt.c    cst_error.c	      cst_globals.c \
-cst_CrtCompSet.c   cst_GetFirstElt.c  cst.h \
-cst_CrtInterSet.c  cst_GetLastElt.c   cst_IsInSetElt.c \
-cst_CrtUnionSet.c  cst_GetNextElt.c   cst_RemSetElt.c \
-cst_DisjunctSet.c  cst_GetPrevElt.c   cst_SetCmp.c
+libSch_la_SOURCES = sch_addshent.c	sch_CrtSch.c  sch_GetCTim.c  sch.h	     sch_rmventry.c \
+                    sch_addshtra.c	sch_debug.c   sch_GetCTra.c  sch_hash.c      sch_SetCTim.c \
+                    sch_addshwav.c	sch_debug.h   sch_GetNTim.c  sch_insentry.c \
+                    sch_AddTra.c	sch_error.c   sch_globals.c  sch_inswave.c \
+                    sch_bug.c	sch_Free.c    sch_GoNTim.c   sch_message.c
 
-
-libSch_la_SOURCES    =  \
-sch_addshent.c	sch_CrtSch.c  sch_GetCTim.c  sch.h	     sch_rmventry.c \
-sch_addshtra.c	sch_debug.c   sch_GetCTra.c  sch_hash.c      sch_SetCTim.c \
-sch_addshwav.c	sch_debug.h   sch_GetNTim.c  sch_insentry.c \
-sch_AddTra.c	sch_error.c   sch_globals.c  sch_inswave.c \
-sch_bug.c	sch_Free.c    sch_GoNTim.c   sch_message.c
-
-libCst_la_LDFLAGS = -version-info @CST_DLL_VERSION@
 libSch_la_LDFLAGS = -version-info @SCH_DLL_VERSION@
+libSch_la_LIBADD  = -lMut
 
-bin_PROGRAMS = asimut
+bin_PROGRAMS      = asimut
 
-asimut_LDADD = \
--lBvl \
--lBhl \
--L. libCst.la libSch.la \
--L$(top_builddir)/mbkvti/src \
--L$(top_builddir)/mbkedif/src \
--L$(top_builddir)/mbkhilo/src \
--L$(top_builddir)/mbkvrlog/src \
--L$(top_builddir)/mbkspice/src \
--L$(top_builddir)/mbkvhdlg/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/bvl/src \
--L$(top_builddir)/bhl/src \
--L$(top_builddir)/beh/src \
--L$(top_builddir)/ppt/src \
--L$(top_builddir)/phl/src \
--L$(top_builddir)/pat/src \
--L$(top_builddir)/log/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkal/src \
--lMlu \
--lMal \
--lMcl -lMel -lMhl -lMgl -lMsl \
-      -lMvg -lMlo -lRcn -lBvl -lBhl -lBeh -lPpt -lPhl -lPat -lLog -lMut
+asimut_LDADD      = -L. libSch.la -lBvl -lBhl \
+                    -L$(top_builddir)/mbk/src \
+                    -L$(top_builddir)/bvl/src \
+                    -L$(top_builddir)/bhl/src \
+                    -L$(top_builddir)/beh/src \
+                    -L$(top_builddir)/pat/src \
+                    -L$(top_builddir)/log/src \
+                    -lMlu -lRcn -lBvl -lBhl -lBeh -lPat -lLog -lMut
 
-asimut_SOURCES = \
-beh_delay.h	  c_fsyn_sr1k_56.c    vh_debug.c    vh_lspec.c	  vh_util.h  vh_init.h \
-beh_setdelay.c	  c_fsyn_sr4k_10.c    vh_debug.h    vh_lspec.h	  vh_xcomm.c \
-c_fsyn_sr1k_10.c  c_hada_repondeur.c  vh_dtype.h    vh_ltype.h	  vh_xcomm.h \
-c_fsyn_sr1k_1.c   c_sr1k_8a.c	      vh_globals.c  vh_simulad.c  vh_xspec.c \
-c_fsyn_sr1k_24.c  c_sr1k_8b.c	      vh_globals.h  vh_simulad.h  vh_xspec.h \
-c_fsyn_sr1k_4.c   c_sr8k_8a.c	      vh_init.c     vh_util.c
+asimut_SOURCES    = beh_delay.h	  c_fsyn_sr1k_56.c    vh_debug.c    vh_lspec.c	  vh_util.h  vh_init.h \
+                    beh_setdelay.c	  c_fsyn_sr4k_10.c    vh_debug.h    vh_lspec.h	  vh_xcomm.c \
+                    c_fsyn_sr1k_10.c  c_hada_repondeur.c  vh_dtype.h    vh_ltype.h	  vh_xcomm.h \
+                    c_fsyn_sr1k_1.c   c_sr1k_8a.c	      vh_globals.c  vh_simulad.c  vh_xspec.c \
+                    c_fsyn_sr1k_24.c  c_sr1k_8b.c	      vh_globals.h  vh_simulad.h  vh_xspec.h \
+                    c_fsyn_sr1k_4.c   c_sr8k_8a.c	      vh_init.c     vh_util.c

alliance/src/aut/src/Makefile.am

@@ -9,3 +9,4 @@ autdebug.h    autexit.h     authash.h     autresize.h   \
 autenv.c      autfree.c     authash2.c    autsort.c
 
 libAut_la_LDFLAGS = -version-info @AUT_DLL_VERSION@
+libAut_la_LIBADD  = -lMut

alliance/src/autostuff

@@ -70,9 +70,9 @@ dirs="$newdirs documentation"
 
 
 ## Order directories.
-order="mbk mbkal mbkap mbkedif mbkhilo mbkmg mbkspice mbkvhdl mbkvrlog mbkvti \
-       mbkvhdlg aut rds rdscif rdsgds elp abl bdd log btr vex ctl ctp abe abt \
-       abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn vpd vvh vtl pat ppt phl gcp \
+order="mbk \
+       aut rds elp abl bdd log btr vex ctl ctp abe abt \
+       abv fsm fks fvh ftl rtn rtd scl vbh vpn pat gcp \
        druc beh bhl bvl"
 ordered_dirs=""
 for lib in $order; do

alliance/src/bdd/src/Makefile.am

@@ -1,28 +1,28 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src
-lib_LTLIBRARIES       = libBdd.la
+lib_LTLIBRARIES     = libBdd.la
 include_HEADERS     = bdd.h
-libBdd_la_SOURCES    = \
-bdd.h            bddenv.h         bddimply.h       bddsimpdc.h \
-bddalloc.c       bdderror.c       bddlog.c         bddsubst.c \
-bddalloc.h       bdderror.h       bddlog.h         bddsubst.h \
-bddapply.c       bddexist.c       bddmark.c        bddsupport.c \
-bddapply.h       bddexist.h       bddmark.h        bddsupport.h \
-bddassoc.c       bddexplosion.c   bddnode.c        bddsweep.c \
-bddassoc.h       bddexplosion.h   bddnode.h        bddsweep.h \
-bddblock.c       bddflag.c        bddoptimize.c    bddsystem.c \
-bddblock.h       bddflag.h        bddoptimize.h    bddsystem.h \
-bddcheck.c       bddfraction.c    bddreduce.c      bddtest.c \
-bddcheck.h       bddfraction.h    bddreduce.h      bddtest.h \
-bddcircuit.c     bddfree.c        bddref.c         bddtransfert.c \
-bddcircuit.h     bddfree.h        bddref.h         bddtransfert.h \
-bddcofactor.c    bddgarbage.c     bddrelprod.c     bdduser.c \
-bddcofactor.h    bddgarbage.h     bddrelprod.h     bdduser.h \
-bddcompose.c     bddheath.c       bddreorder.c     bddvar.c \
-bddcompose.h     bddheath.h       bddreorder.h     bddvar.h \
-bddconvert.c     bddhnode.c       bddresize.c      bddvaraux.c \
-bddconvert.h     bddhnode.h       bddresize.h      bddvaraux.h \
-bdddump.c        bddhoper.c       bddsatisfy.c     \
-bdddump.h        bddhoper.h       bddsatisfy.h     \
-bddenv.c         bddimply.c       bddsimpdc.c
+libBdd_la_SOURCES   = bdd.h            bddenv.h         bddimply.h       bddsimpdc.h \
+                      bddalloc.c       bdderror.c       bddlog.c         bddsubst.c \
+                      bddalloc.h       bdderror.h       bddlog.h         bddsubst.h \
+                      bddapply.c       bddexist.c       bddmark.c        bddsupport.c \
+                      bddapply.h       bddexist.h       bddmark.h        bddsupport.h \
+                      bddassoc.c       bddexplosion.c   bddnode.c        bddsweep.c \
+                      bddassoc.h       bddexplosion.h   bddnode.h        bddsweep.h \
+                      bddblock.c       bddflag.c        bddoptimize.c    bddsystem.c \
+                      bddblock.h       bddflag.h        bddoptimize.h    bddsystem.h \
+                      bddcheck.c       bddfraction.c    bddreduce.c      bddtest.c \
+                      bddcheck.h       bddfraction.h    bddreduce.h      bddtest.h \
+                      bddcircuit.c     bddfree.c        bddref.c         bddtransfert.c \
+                      bddcircuit.h     bddfree.h        bddref.h         bddtransfert.h \
+                      bddcofactor.c    bddgarbage.c     bddrelprod.c     bdduser.c \
+                      bddcofactor.h    bddgarbage.h     bddrelprod.h     bdduser.h \
+                      bddcompose.c     bddheath.c       bddreorder.c     bddvar.c \
+                      bddcompose.h     bddheath.h       bddreorder.h     bddvar.h \
+                      bddconvert.c     bddhnode.c       bddresize.c      bddvaraux.c \
+                      bddconvert.h     bddhnode.h       bddresize.h      bddvaraux.h \
+                      bdddump.c        bddhoper.c       bddsatisfy.c     \
+                      bdddump.h        bddhoper.h       bddsatisfy.h     \
+                      bddenv.c         bddimply.c       bddsimpdc.c
 
-libBdd_la_LDFLAGS = -version-info @BDD_DLL_VERSION@
+libBdd_la_LDFLAGS   = -version-info @BDD_DLL_VERSION@
+libBdd_la_LIBADD    = -lAbl -lAut

alliance/src/beh/src/Makefile.am

@@ -1,23 +1,28 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/log/src
-lib_LTLIBRARIES       = libBeh.la
-include_HEADERS     = beh.h
-libBeh_la_SOURCES    = \
-beh_addbeaux.c	 beh_delbebus.c    beh_frebeaux.c  beh_message.c \
-beh_addbebus.c	 beh_delbebux.c    beh_frebebus.c  beh_rmvbeaux.c \
-beh_addbebux.c	 beh_delbeder.c    beh_frebebux.c  beh_rmvbebus.c \
-beh_addbeder.c	 beh_delbefig.c    beh_frebeder.c  beh_rmvbebux.c \
-beh_addbefig.c	 beh_delbegen.c    beh_frebefig.c  beh_rmvbeder.c \
-beh_addbegen.c	 beh_delbemsg.c    beh_frebegen.c  beh_rmvbefig.c \
-beh_addbemsg.c	 beh_delbeout.c    beh_frebemsg.c  beh_rmvbegen.c \
-beh_addbeout.c	 beh_delbepor.c    beh_frebeout.c  beh_rmvbemsg.c \
-beh_addbepor.c	 beh_delbequad.c   beh_frebepor.c  beh_rmvbeout.c \
-beh_addbequad.c  beh_delbereg.c    beh_frebereg.c  beh_rmvbepor.c \
-beh_addbereg.c	 beh_delberin.c    beh_freberin.c  beh_rmvbereg.c \
-beh_addberin.c	 beh_delbiabl.c    beh_frebiabl.c  beh_rmvberin.c \
-beh_addbiabl.c	 beh_delbinod.c    beh_frebinod.c  beh_rpldelayed.c \
-beh_addbinod.c	 beh_dict.c	   beh_getgenva.c  beh_rplstable.c \
-beh_apdbeaux.c	 beh_error.c	   beh_getvers.c   beh_toolbug.c \
-beh_apdberin.c	 beh_expdelayed.c  beh_globals.c   beh_vhdlname.c \
-beh_delbeaux.c	 beh_expstable.c   beh.h	   beh_vhvector.c
+lib_LTLIBRARIES     = libBeh.la
+include_HEADERS     = beh.h cst.h
+libBeh_la_SOURCES   = beh_addbeaux.c	 beh_delbebus.c    beh_frebeaux.c  beh_message.c \
+                      beh_addbebus.c	 beh_delbebux.c    beh_frebebus.c  beh_rmvbeaux.c \
+                      beh_addbebux.c	 beh_delbeder.c    beh_frebebux.c  beh_rmvbebus.c \
+                      beh_addbeder.c	 beh_delbefig.c    beh_frebeder.c  beh_rmvbebux.c \
+                      beh_addbefig.c	 beh_delbegen.c    beh_frebefig.c  beh_rmvbeder.c \
+                      beh_addbegen.c	 beh_delbemsg.c    beh_frebegen.c  beh_rmvbefig.c \
+                      beh_addbemsg.c	 beh_delbeout.c    beh_frebemsg.c  beh_rmvbegen.c \
+                      beh_addbeout.c	 beh_delbepor.c    beh_frebeout.c  beh_rmvbemsg.c \
+                      beh_addbepor.c	 beh_delbequad.c   beh_frebepor.c  beh_rmvbeout.c \
+                      beh_addbequad.c  beh_delbereg.c    beh_frebereg.c  beh_rmvbepor.c \
+                      beh_addbereg.c	 beh_delberin.c    beh_freberin.c  beh_rmvbereg.c \
+                      beh_addberin.c	 beh_delbiabl.c    beh_frebiabl.c  beh_rmvberin.c \
+                      beh_addbiabl.c	 beh_delbinod.c    beh_frebinod.c  beh_rpldelayed.c \
+                      beh_addbinod.c	 beh_dict.c	   beh_getgenva.c  beh_rplstable.c \
+                      beh_apdbeaux.c	 beh_error.c	   beh_getvers.c   beh_toolbug.c \
+                      beh_apdberin.c	 beh_expdelayed.c  beh_globals.c   beh_vhdlname.c \
+                      beh_delbeaux.c	 beh_expstable.c   beh.h	   beh_vhvector.c \
+                      cst_AddSetElt.c    cst_error.c       cst_globals.c \
+                      cst_CrtCompSet.c   cst_GetFirstElt.c cst.h \
+                      cst_CrtInterSet.c  cst_GetLastElt.c  cst_IsInSetElt.c \
+                      cst_CrtUnionSet.c  cst_GetNextElt.c  cst_RemSetElt.c \
+                      cst_DisjunctSet.c  cst_GetPrevElt.c  cst_SetCmp.c
 
-libBeh_la_LDFLAGS = -version-info @BEH_DLL_VERSION@
+libBeh_la_LDFLAGS   = -version-info @BEH_DLL_VERSION@
+libBeh_la_LIBADD    = -lLog -lAbl -lAut -lMut

alliance/src/bhl/src/Makefile.am

@@ -1,11 +1,10 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/log/src -I$(top_srcdir)/beh/src
-lib_LTLIBRARIES       = libBhl.la
+lib_LTLIBRARIES     = libBhl.la
 include_HEADERS     = bhl.h
-libBhl_la_SOURCES    = \
-beh_chkbefig.c	 beh_dly2sta.c	 beh_makbdd.c	 beh_makvarlist.c \
-beh_clrdepend.c  beh_freabl.c	 beh_makderiv.c  beh_namelist.c \
-beh_debug.c	 beh_gettu.c	 beh_makgex.c	 beh_sta2dly.c \
-beh_debug.h	 beh_indexbdd.c  beh_maknode.c	 beh_unamlist.c \
-beh_depend.c	 beh_makquad.c	 bhl.h
-
-libBhl_la_LDFLAGS = -version-info @BHL_DLL_VERSION@
+libBhl_la_SOURCES   = beh_chkbefig.c	 beh_dly2sta.c	 beh_makbdd.c	 beh_makvarlist.c \
+                      beh_clrdepend.c  beh_freabl.c	 beh_makderiv.c  beh_namelist.c \
+                      beh_debug.c	 beh_gettu.c	 beh_makgex.c	 beh_sta2dly.c \
+                      beh_debug.h	 beh_indexbdd.c  beh_maknode.c	 beh_unamlist.c \
+                      beh_depend.c	 beh_makquad.c	 bhl.h
+libBhl_la_LDFLAGS   = -version-info @BHL_DLL_VERSION@
+libBhl_la_LIBADD    = -lBeh -lAut -lMut

alliance/src/boog/src/Makefile.am

@@ -1,58 +1,48 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS =  -I$(top_srcdir)/abe/src \
--I$(top_srcdir)/abl/src \
--I$(top_srcdir)/abv/src \
--I$(top_srcdir)/bdd/src \
--I$(top_srcdir)/aut/src \
--I$(top_srcdir)/mbk/src \
-@ALLIANCE_CFLAGS@
+AM_CFLAGS    = -I$(top_srcdir)/abe/src \
+               -I$(top_srcdir)/abl/src \
+               -I$(top_srcdir)/abv/src \
+               -I$(top_srcdir)/bdd/src \
+               -I$(top_srcdir)/aut/src \
+               -I$(top_srcdir)/mbk/src \
+               @ALLIANCE_CFLAGS@
 
 bin_PROGRAMS = boog
 
-boog_LDADD = @ALLIANCE_LIBS@ \
--L$(builddir)/../../abv/src \
--L$(builddir)/../../abe/src \
--L$(builddir)/../../abt/src \
--L$(builddir)/../../mbk/src \
--L$(builddir)/../../mbkvti/src \
--L$(builddir)/../../mbkal/src \
--L$(builddir)/../../mbkspice/src \
--L$(builddir)/../../mbkhilo/src \
--L$(builddir)/../../mbkedif/src \
--L$(builddir)/../../mbkvhdlg/src \
--L$(builddir)/../../mbkvrlog/src \
--L$(builddir)/../../mbk/src \
--L$(builddir)/../../mbk/src \
--L$(builddir)/../../bdd/src \
--L$(builddir)/../../abl/src \
--L$(builddir)/../../aut/src \
--L$(builddir)/../../mbk/src \
-          -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvg -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
+boog_LDADD   = @ALLIANCE_LIBS@ \
+               -L$(builddir)/../../abv/src \
+               -L$(builddir)/../../abe/src \
+               -L$(builddir)/../../abt/src \
+               -L$(builddir)/../../mbk/src \
+               -L$(builddir)/../../mbk/src \
+               -L$(builddir)/../../bdd/src \
+               -L$(builddir)/../../abl/src \
+               -L$(builddir)/../../aut/src \
+               -lAbv -lAbe -lAbt -lMlu -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   
-boog_SOURCES = \
-bog_lax_param.c            bog_map_adapt.h            bog_normalize_simplify.h \
-bog_lax_param.h            bog_map_befig.c            bog_signal_adapt.c \
-bog_lib_cell.c             bog_map_befig.h            bog_signal_adapt.h \
-bog_lib_cell.h             bog_map_delay.c            bog_signal_delay.c \
-bog_lib_complete.c         bog_map_delay.h            bog_signal_delay.h \
-bog_lib_complete.h         bog_map_pattern.c          bog_signal_nameindex.c \
-bog_lib_format.c           bog_map_pattern.h          bog_signal_nameindex.h \
-bog_lib_format.h           bog_map_prepare.c          bog_signal_utils.c \
-bog_lib_matching.c         bog_map_prepare.h          bog_signal_utils.h \
-bog_lib_matching.h         bog_normalize_ARITY.c      bog_unflatten_abl.c \
-bog_lib_negativ.c          bog_normalize_ARITY.h      bog_unflatten_abl.h \
-bog_lib_negativ.h          bog_normalize_DAG.c        bog_unflatten_area.c \
-bog_lib_permute.c          bog_normalize_DAG.h        bog_unflatten_area.h \
-bog_lib_permute.h          bog_normalize_DC.c         bog_unflatten_befig.c \
-bog_lib_reader.c           bog_normalize_DC.h         bog_unflatten_befig.h \
-bog_lib_reader.h           bog_normalize_message.c    bog_unflatten_delay.c \
-bog_lib_specifications.c   bog_normalize_message.h    bog_unflatten_delay.h \
-bog_lib_specifications.h   bog_normalize_nameindex.c  bog_unflatten_oper.c \
-bog_lib_utils.c            bog_normalize_nameindex.h  bog_unflatten_oper.h \
-bog_lib_utils.h            bog_normalize_power.c      bog_unflatten_utils.c \
-bog_main.c                 bog_normalize_power.h      bog_unflatten_utils.h \
-bog_map_abl.c              bog_normalize_register.c   bog_xsch_driver.c \
-bog_map_abl.h              bog_normalize_register.h   bog_xsch_driver.h \
-bog_map_adapt.c            bog_normalize_simplify.c
+boog_SOURCES = bog_lax_param.c            bog_map_adapt.h            bog_normalize_simplify.h \
+               bog_lax_param.h            bog_map_befig.c            bog_signal_adapt.c \
+               bog_lib_cell.c             bog_map_befig.h            bog_signal_adapt.h \
+               bog_lib_cell.h             bog_map_delay.c            bog_signal_delay.c \
+               bog_lib_complete.c         bog_map_delay.h            bog_signal_delay.h \
+               bog_lib_complete.h         bog_map_pattern.c          bog_signal_nameindex.c \
+               bog_lib_format.c           bog_map_pattern.h          bog_signal_nameindex.h \
+               bog_lib_format.h           bog_map_prepare.c          bog_signal_utils.c \
+               bog_lib_matching.c         bog_map_prepare.h          bog_signal_utils.h \
+               bog_lib_matching.h         bog_normalize_ARITY.c      bog_unflatten_abl.c \
+               bog_lib_negativ.c          bog_normalize_ARITY.h      bog_unflatten_abl.h \
+               bog_lib_negativ.h          bog_normalize_DAG.c        bog_unflatten_area.c \
+               bog_lib_permute.c          bog_normalize_DAG.h        bog_unflatten_area.h \
+               bog_lib_permute.h          bog_normalize_DC.c         bog_unflatten_befig.c \
+               bog_lib_reader.c           bog_normalize_DC.h         bog_unflatten_befig.h \
+               bog_lib_reader.h           bog_normalize_message.c    bog_unflatten_delay.c \
+               bog_lib_specifications.c   bog_normalize_message.h    bog_unflatten_delay.h \
+               bog_lib_specifications.h   bog_normalize_nameindex.c  bog_unflatten_oper.c \
+               bog_lib_utils.c            bog_normalize_nameindex.h  bog_unflatten_oper.h \
+               bog_lib_utils.h            bog_normalize_power.c      bog_unflatten_utils.c \
+               bog_main.c                 bog_normalize_power.h      bog_unflatten_utils.h \
+               bog_map_abl.c              bog_normalize_register.c   bog_xsch_driver.c \
+               bog_map_abl.h              bog_normalize_register.h   bog_xsch_driver.h \
+               bog_map_adapt.c            bog_normalize_simplify.c
 

alliance/src/btr/src/Makefile.am

@@ -1,9 +1,8 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src
-lib_LTLIBRARIES       = libBtr.la
+lib_LTLIBRARIES     = libBtr.la
 include_HEADERS     = btr.h
-libBtr_la_SOURCES    = \
-btr.h	    btrenv.c	btrerror.h  btrfunc.c	 btrresize.h  \
-btralloc.c  btrenv.h	btrfree.c   btrfunc.h	 btrtrans.c \
-btralloc.h  btrerror.c	btrfree.h   btrresize.c  btrtrans.h
-
-libBtr_la_LDFLAGS = -version-info @BTR_DLL_VERSION@
+libBtr_la_SOURCES   = btr.h	  btrenv.c	btrerror.h  btrfunc.c	 btrresize.h  \
+                      btralloc.c  btrenv.h	btrfree.c   btrfunc.h	 btrtrans.c   \
+                      btralloc.h  btrerror.c	btrfree.h   btrresize.c  btrtrans.h
+libBtr_la_LDFLAGS   = -version-info @BTR_DLL_VERSION@
+libBtr_la_LIBADD    = -lBdd

alliance/src/bvl/src/Makefile.am

@@ -4,8 +4,8 @@ include_HEADERS     = bvl.h
 libBvl_la_SOURCES   = bvl_bcomp_y.y bvl_bcomp_l.l  bvl_bcomp_y.h \
                       bvl_bedef.h   bvl_drive.c    bvl.h         bvl_util.c \
                       bvl_byacc.h   bvl_globals.c  bvl_parse.c
-
 libBvl_la_LDFLAGS   = -version-info @BVL_DLL_VERSION@
+libBvl_la_LIBADD    = -lBhl -lBeh -lMut
 
 CLEANFILES          = bvl_bcomp_y.c bvl_bcomp_y.h bvl_bcomp_l.c
 

alliance/src/ctl/src/Makefile.am

@@ -1,9 +1,8 @@
 AM_CFLAGS           = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/vex/src
-lib_LTLIBRARIES       = libCtl.la
+lib_LTLIBRARIES     = libCtl.la
 include_HEADERS     = ctl.h
-libCtl_la_SOURCES    = \
-ctladd.c    ctlalloc.h	ctlenv.c    ctlerror.h	ctl.h	     ctlview.c \
-ctladd.h    ctldel.c	ctlenv.h    ctlfree.c	ctlsearch.c  ctlview.h \
-ctlalloc.c  ctldel.h	ctlerror.c  ctlfree.h	ctlsearch.h
-
-libCtl_la_LDFLAGS = -version-info @CTL_DLL_VERSION@
+libCtl_la_SOURCES   = ctladd.c    ctlalloc.h	ctlenv.c    ctlerror.h	ctl.h	     ctlview.c \
+                      ctladd.h    ctldel.c	ctlenv.h    ctlfree.c	ctlsearch.c  ctlview.h \
+                      ctlalloc.c  ctldel.h	ctlerror.c  ctlfree.h	ctlsearch.h
+libCtl_la_LDFLAGS   = -version-info @CTL_DLL_VERSION@
+libCtl_la_LIBADD    = -lVex -lAut -lMut

alliance/src/ctp/src/Makefile.am

@@ -1,23 +1,24 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/vex/src -I$(top_srcdir)/ctl/src
-lib_LTLIBRARIES       = libCtp.la
+lib_LTLIBRARIES     = libCtp.la
 include_HEADERS     = ctp.h
-libCtp_la_SOURCES    = ctp_y.y ctp_l.l ctp.h  \
-ctp_bedef.h  ctp_bspec.c  ctp_byacc.h  ctp_parse.c  ctp_util.h \
-ctp_blex.h   ctp_bspec.h  ctp_util.c   ctp_utype.h
-
-libCtp_la_LDFLAGS = -version-info @CTP_DLL_VERSION@
+libCtp_la_SOURCES   = ctp_y.y ctp_l.l ctp.h  \
+                      ctp_bedef.h  ctp_bspec.c  ctp_byacc.h  ctp_parse.c  ctp_util.h \
+                      ctp_blex.h   ctp_bspec.h  ctp_util.c   ctp_utype.h
+libCtp_la_LDFLAGS   = -version-info @CTP_DLL_VERSION@
+libCtp_la_LIBADD    = -lCtl -lVex -lAut -lMut
 
 CLEANFILES          = ctp_y.c ctp_y.h ctp_l.c
 
 
 ctp_y.c ctp_y.h : $(srcdir)/ctp_y.y
-	$(YACC) -d $(YFLAGS) $(srcdir)/ctp_y.y && sed -e "s/yy/ctp_y_/g" -e "s/YY/CTL_Y_/g" y.tab.c > ctp_y.c && sed -e "s/yy/ctp_y_/g" -e "s/YY/CTL_Y_/g" y.tab.h > ctp_y.h
+	$(YACC) -d $(YFLAGS) $(srcdir)/ctp_y.y && \
+	sed -e "s/yy/ctp_y_/g" -e "s/YY/CTL_Y_/g" y.tab.c > ctp_y.c && \
+	sed -e "s/yy/ctp_y_/g" -e "s/YY/CTL_Y_/g" y.tab.h > ctp_y.h
 ctp_l.c : $(srcdir)/ctp_l.l ctp_y.h
 	$(LEX) -t $(srcdir)/ctp_l.l | sed -e "s/yy/ctp_y_/g" -e "s/YY/CTL_Y_/g" > ctp_l.c
 
-EXTRA_PROGRAMS = ctptest
+EXTRA_PROGRAMS  = ctptest
 
-ctptest_LDADD = -L. -lCtp \
-                -lCtl -lVex -lAut -lMut
+ctptest_LDADD   = -L. -lCtp -lCtl -lVex -lAut -lMut
 
 ctptest_SOURCES = main.c

alliance/src/dreal/src/Makefile.am

@@ -1,16 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = dreal
-AM_CFLAGS = -I$(top_srcdir)/mbk/src \
--I$(top_srcdir)/rds/src \
-@ALLIANCE_CFLAGS@ @X_CFLAGS@ \
-         -DDREAL_DEFAULT_TECHNO_NAME=\"etc/cmos.dreal\" \
-         -DGMS_FILE_NAME=\".dreal.cfg\" \
-         -DDREAL_WINDOW_DX=\"DREAL_WINDOW_DX\" \
-         -DDREAL_WINDOW_DY=\"DREAL_WINDOW_DY\" \
-         -DDREAL_WINDOW_XMIN=\"DREAL_WINDOW_XMIN\" \
-         -DDREAL_WINDOW_YMIN=\"DREAL_WINDOW_YMIN\" \
-         -DDREAL_WINDOW_SIDE=\"DREAL_WINDOW_SIDE\" 
+AM_CFLAGS    = -I$(top_srcdir)/mbk/src \
+               -I$(top_srcdir)/rds/src \
+               @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
+               -DDREAL_DEFAULT_TECHNO_NAME=\"etc/cmos.dreal\" \
+               -DGMS_FILE_NAME=\".dreal.cfg\" \
+               -DDREAL_WINDOW_DX=\"DREAL_WINDOW_DX\" \
+               -DDREAL_WINDOW_DY=\"DREAL_WINDOW_DY\" \
+               -DDREAL_WINDOW_XMIN=\"DREAL_WINDOW_XMIN\" \
+               -DDREAL_WINDOW_YMIN=\"DREAL_WINDOW_YMIN\" \
+               -DDREAL_WINDOW_SIDE=\"DREAL_WINDOW_SIDE\" 
 
 
 # -----------------------------------------------------------------------------
@@ -48,14 +48,9 @@ ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXT) $(LIBXPM) \
 
 
 dreal_LDADD = @ALLIANCE_LIBS@ $(ALL_X_LIBS) \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkap/src \
--L$(top_builddir)/mbkmg/src \
--L$(top_builddir)/mbkvti/src \
--L$(top_builddir)/rds/src \
--L$(top_builddir)/rdscif/src \
--L$(top_builddir)/rdsgds/src \
--lRtl -lRgs -lRcf -lRut -lRfm -lRpr -lRds -lMpu -lMap -lMmg -lMcp -lMph -lMut 
+              -L$(top_builddir)/mbk/src \
+              -L$(top_builddir)/rds/src \
+              -lRds -lMpu -lMph -lMut 
 
 
 dreal_SOURCES = \

alliance/src/druc/src/Makefile.am

@@ -23,15 +23,9 @@ bin_PROGRAMS = druc
 
 AM_CFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src
 
-druc_LDADD = $(ALLIANCE_LIBS) -L. -lVrd \
--L$(builddir)/../../rds/src -lRtl -lRgs \
--L$(builddir)/../../rdscif/src -lRcf -lRfm -lRpr -lRwi -lRut \
--L$(builddir)/../../rdsgds/src -lRds \
--L$(builddir)/../../mbk/src -lMpu \
--L$(builddir)/../../mbkvti/src -lMcp \
--L$(builddir)/../../mbkap/src -lMap \
--L$(builddir)/../../mbkmg/src -lMmg -lMph \
--lMut
+druc_LDADD = $(ALLIANCE_LIBS) -L. libVrd.la \
+-L$(builddir)/../../rds/src -lRds \
+-L$(builddir)/../../mbk/src -lMpu -lMut
 
 druc_SOURCES = \
 drucbath.c drucbath.h

alliance/src/elp/src/Makefile.am

@@ -1,11 +1,11 @@
 AM_CFLAGS           = -DTECHNOLOGY=\"etc/prol.elp\" -I$(top_srcdir)/mbk/src
 
-lib_LTLIBRARIES       = libElp.la
+lib_LTLIBRARIES     = libElp.la
 include_HEADERS     = elp.h
-libElp_la_SOURCES    = elp_y.y elp_l.l \
-elp.c  elperror.c  elp.h
+libElp_la_SOURCES   = elp_y.y elp_l.l elp.c  elperror.c elp.h
 
-libElp_la_LDFLAGS = -version-info @ELP_DLL_VERSION@
+libElp_la_LDFLAGS   = -version-info @ELP_DLL_VERSION@
+libElp_la_LIBADD    = -lRcn -lMut
 
 CLEANFILES          = elp_y.c elp_y.h elp_l.c
 

alliance/src/fks/src/Makefile.am

@@ -1,8 +1,10 @@
-AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src \
--I$(top_srcdir)/fsm/src
-lib_LTLIBRARIES       = libFks.la
+AM_CFLAGS           = -I$(top_srcdir)/mbk/src \
+                      -I$(top_srcdir)/aut/src \
+                      -I$(top_srcdir)/abl/src \
+                      -I$(top_srcdir)/bdd/src \
+                      -I$(top_srcdir)/fsm/src
+lib_LTLIBRARIES     = libFks.la
 include_HEADERS     = fks.h
-libFks_la_SOURCES    = \
-fks.h  fksdrive.c  fksdrive.h  fkserror.c  fkserror.h  fksparse.c  fksparse.h
-
-libFks_la_LDFLAGS = -version-info @FKS_DLL_VERSION@
+libFks_la_SOURCES   = fks.h  fksdrive.c  fksdrive.h  fkserror.c  fkserror.h  fksparse.c  fksparse.h
+libFks_la_LDFLAGS   = -version-info @FKS_DLL_VERSION@
+libFks_la_LIBADD    = -lFsm -lAbl -lBdd -lAut -lMut

alliance/src/flatbeh/src/Makefile.am

@@ -15,17 +15,10 @@ flatbeh_LDADD = @ALLIANCE_LIBS@ \
 -L$(top_srcdir)/abe/src \
 -L$(top_srcdir)/abt/src \
 -L$(top_srcdir)/mbk/src \
--L$(top_srcdir)/mbkvti/src \
--L$(top_srcdir)/mbkal/src \
--L$(top_srcdir)/mbkspice/src \
--L$(top_srcdir)/mbkhilo/src \
--L$(top_srcdir)/mbkedif/src \
--L$(top_srcdir)/mbkvhdl/src \
--L$(top_srcdir)/mbkvrlog/src \
 -L$(top_srcdir)/bdd/src \
 -L$(top_srcdir)/abl/src \
 -L$(top_srcdir)/aut/src \
-          -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvl -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
+          -lAbv -lAbe -lAbt -lMlu -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   
 flatbeh_SOURCES = abstract.c abstract.h utils.c utils.h main.c
 

alliance/src/flatlo/src/Makefile.am

@@ -12,24 +12,10 @@ flatlo_LDADD   = \
 -L$(top_builddir)/aut/src \
 -L$(top_builddir)/bdd/src \
 -L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkal/src \
--L$(top_builddir)/mbkedif/src \
--L$(top_builddir)/mbkhilo/src \
--L$(top_builddir)/mbkspice/src \
--L$(top_builddir)/mbkvhdlg/src \
--L$(top_builddir)/mbkvrlog/src \
--L$(top_builddir)/mbkvti/src \
 		     -lAbv \
 	             -lAbe \
 	             -lAbt \
 	             -lMlu \
-	             -lMcl \
-	             -lMal \
-	             -lMsl \
-	             -lMhl \
-	             -lMel \
-	             -lMvg \
-	             -lMgl \
 	             -lRcn \
 	             -lMlo \
 	             -lBdd \

alliance/src/flatph/src/Makefile.am

@@ -6,23 +6,7 @@ bin_PROGRAMS = flatph
 
 flatph_LDADD = @ALLIANCE_LIBS@ \
 -L$(top_srcdir)/mbk/src \
--L$(top_srcdir)/mbkal/src \
--L$(top_srcdir)/mbkap/src \
--L$(top_srcdir)/mbkedif/src \
--L$(top_srcdir)/mbkhilo/src \
--L$(top_srcdir)/mbkmg/src \
--L$(top_srcdir)/mbkspice/src \
--L$(top_srcdir)/mbkvhdl/src \
--L$(top_srcdir)/mbkvrlog/src \
--L$(top_srcdir)/mbkvti/src \
           -lMpu -lMlu \
-	  -lMcl -lMcp \
-	  -lMal -lMap \
-	  -lMsl \
-	  -lMel -lMgl \
-	  -lMhl \
-	  -lMvl \
-	  -lMmg \
 	  -lMlo \
 	  -lMph -lMut \
 	  -lRcn 

alliance/src/fsm/src/Makefile.am

@@ -1,10 +1,9 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src
-lib_LTLIBRARIES       = libFsm.la
+lib_LTLIBRARIES     = libFsm.la
 include_HEADERS     = fsm.h
-libFsm_la_SOURCES    = \
-fsm.h	    fsmalloc.h	fsmdel.h    fsmfree.h	 fsmsearch.h  fsmview.h \
-fsmadd.c    fsmbdd.c	fsmerror.c  fsmorder.c	 fsmsimp.c \
-fsmadd.h    fsmbdd.h	fsmerror.h  fsmorder.h	 fsmsimp.h \
-fsmalloc.c  fsmdel.c	fsmfree.c   fsmsearch.c  fsmview.c
-
-libFsm_la_LDFLAGS = -version-info @FSM_DLL_VERSION@
+libFsm_la_SOURCES   = fsm.h	    fsmalloc.h	fsmdel.h    fsmfree.h	 fsmsearch.h  fsmview.h \
+                      fsmadd.c    fsmbdd.c	fsmerror.c  fsmorder.c	 fsmsimp.c \
+                      fsmadd.h    fsmbdd.h	fsmerror.h  fsmorder.h	 fsmsimp.h \
+                      fsmalloc.c  fsmdel.c	fsmfree.c   fsmsearch.c  fsmview.c
+libFsm_la_LDFLAGS   = -version-info @FSM_DLL_VERSION@
+libFsm_la_LIBADD    = -lBdd -lAbl -lAut -lMut

alliance/src/ftl/src/Makefile.am

@@ -1,15 +1,16 @@
-AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src \
--I$(top_srcdir)/fsm/src
-lib_LTLIBRARIES       = libFtl.la
+AM_CFLAGS           = -I$(top_srcdir)/mbk/src \
+                      -I$(top_srcdir)/aut/src \
+                      -I$(top_srcdir)/abl/src \
+                      -I$(top_srcdir)/bdd/src \
+                      -I$(top_srcdir)/fsm/src
+lib_LTLIBRARIES     = libFtl.la
 include_HEADERS     = ftl.h
-libFtl_la_SOURCES    = \
-ftl.h  ftlacces.c  ftlacces.h  ftlerror.c  ftlerror.h
-
-libFtl_la_LDFLAGS = -version-info @FTL_DLL_VERSION@
+libFtl_la_SOURCES   = ftl.h  ftlacces.c  ftlacces.h  ftlerror.c  ftlerror.h
+libFtl_la_LDFLAGS   = -version-info @FTL_DLL_VERSION@
+libFtl_la_LIBADD    = -lFks -lFvh -lFsm -lBdd -lAbl -lAut -lMut 
 
 EXTRA_PROGRAMS = fsmtest
 
 
-fsmtest_LDADD = -L. -lFtl -lFks -lFvh -lFsm \
-	        -lBdd -lAbl -lAut -lMut
-fsmtest_SOURCES = main.c
+fsmtest_LDADD       = -L. -lFtl -lFks -lFvh -lFsm -lBdd -lAbl -lAut -lMut
+fsmtest_SOURCES     = main.c

alliance/src/fvh/src/Makefile.am

@@ -1,20 +1,26 @@
-AM_CFLAGS           = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/aut/src -I$(top_srcdir)/abl/src -I$(top_srcdir)/bdd/src \
--I$(top_srcdir)/fsm/src
-lib_LTLIBRARIES       = libFvh.la
+AM_CFLAGS           = -I$(top_srcdir)/mbk/src \
+                      -I$(top_srcdir)/aut/src \
+                      -I$(top_srcdir)/abl/src \
+                      -I$(top_srcdir)/bdd/src \
+                      -I$(top_srcdir)/fsm/src
+lib_LTLIBRARIES     = libFvh.la
 include_HEADERS     = fvh.h
-libFvh_la_SOURCES    = fbl_bcomp_y.y fbl_bcomp_l.l \
-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
+libFvh_la_SOURCES   = fbl_bcomp_y.y fbl_bcomp_l.l \
+                      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
 
-libFvh_la_LDFLAGS = -version-info @FVH_DLL_VERSION@
+libFvh_la_LDFLAGS   = -version-info @FVH_DLL_VERSION@
+libFvh_la_LIBADD    = -lFsm -lAbl -lBdd -lAut -lMut
 
 CLEANFILES          = fbl_bcomp_y.c fbl_bcomp_y.h fbl_bcomp_l.c
 
 fbl_bcomp_y.c fbl_bcomp_y.h : $(srcdir)/fbl_bcomp_y.y
-	$(YACC) -d $(YFLAGS) $(srcdir)/fbl_bcomp_y.y && sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.c > fbl_bcomp_y.c && sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.h > fbl_bcomp_y.h
+	$(YACC) -d $(YFLAGS) $(srcdir)/fbl_bcomp_y.y && \
+	sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.c > fbl_bcomp_y.c && \
+	sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.h > fbl_bcomp_y.h
 fbl_bcomp_l.c : $(srcdir)/fbl_bcomp_l.l fbl_bcomp_y.h
 	$(LEX) -t $(srcdir)/fbl_bcomp_l.l | sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" > fbl_bcomp_l.c

alliance/src/genlib/src/Makefile.am

@@ -26,6 +26,7 @@ libMgn_la_SOURCES   = genlib.c \
                       dpgen_Shifter.c
 
 libMgn_la_LDFLAGS = -version-info @MGN_DLL_VERSION@
+libMgn_la_LIBADD  = -lMlu -lMlo -lMpu -lMph -lMut
 
 bin_SCRIPTS         = genlib
 CLEANFILES          = genlib y.output dpgen_ROM_code.c dpgen_ROM_code.h

alliance/src/genlib/src/genlib.sh

@@ -248,25 +248,14 @@ cat << EOF > $MAKEFILE
   LOCAL_ALC_LVBE = -lBvl \\
                    -lBeh \\
                    -lBhl \\
-                   -lLog \\
-                   -lCst
+                   -lLog
   LOCAL_ALC_LMGN = -lMgn
   LOCAL_ALC_LMUT = -lMut
   LOCAL_ALC_LMLO = -lMlu \\
                    -lMlo \\
-                   -lMal \\
-                   -lMcl \\
-                   -lMgl \\
-                   -lMel \\
-                   -lMhl \\
-                   -lMsl \\
-                   -lMvg \\
                    -lRcn
   LOCAL_ALC_LMPH = -lMpu \\
-                   -lMph \\
-                   -lMap \\
-                   -lMcp \\
-                   -lMmg
+                   -lMph
   LOCAL_ALC_LIBS = \$(LOCAL_ALC_LDIR) \\
                    \$(LOCAL_ALC_LVBE) \\
                    \$(LOCAL_ALC_LMGN) \\

alliance/src/genpat/src/Makefile.am

@@ -1,18 +1,17 @@
-AM_CFLAGS           = -I$(top_srcdir)/mbk/src \
--I$(top_srcdir)/pat/src \
--I$(top_srcdir)/ppt/src \
--I$(top_srcdir)/phl/src
+AM_CFLAGS         = -I$(top_srcdir)/mbk/src \
+                    -I$(top_srcdir)/pat/src 
 
-lib_LTLIBRARIES     = libPgn.la
-include_HEADERS     = genpat.h 
-libPgn_la_SOURCES   = AFFECT.c ARRAY.c CONV.c DECLAR.c DEF_GEN.c GETCPAT.c \
-		INIT.c LABEL.c  SAVE.c SAV_GEN.c SETTUNIT.c \
-		libpat_l.c libpat_l.h
+lib_LTLIBRARIES   = libPgn.la
+include_HEADERS   = genpat.h 
+libPgn_la_SOURCES = AFFECT.c ARRAY.c CONV.c DECLAR.c DEF_GEN.c GETCPAT.c \
+                    INIT.c LABEL.c  SAVE.c SAV_GEN.c SETTUNIT.c \
+                    libpat_l.c libpat_l.h
 
 libPgn_la_LDFLAGS = -version-info @PGN_DLL_VERSION@
+libPgn_la_LIBADD  = -lPat -lMut
 
-bin_SCRIPTS         = genpat
-CLEANFILES          = genpat
+bin_SCRIPTS       = genpat
+CLEANFILES        = genpat
 
 genpat : ${srcdir}/genpat.sh
 	${SED} 's,__ALLIANCE_INSTALL_DIR__,$(ALLIANCE_INSTALL_DIR),' $< > $@

alliance/src/genpat/src/genpat.sh

@@ -59,8 +59,6 @@ cat << EOF  > $makefile
 
 ALLIANCE_LIBRARY = -L\$(ALLIANCE_TOP)/lib \\
                      -lPgn \\
-                     -lPpt \\
-                     -lPhl \\
                      -lPat \\
                      -lMut \\
                      -lRcn

alliance/src/graal/src/Makefile.am

@@ -1,17 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = graal
-AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
--I$(top_srcdir)/mbk/src \
--I$(top_srcdir)/rds/src \
--I$(top_srcdir)/druc/src \
-         -DGRAAL_DEFAULT_TECHNO_NAME=\"etc/cmos.graal\" \
-         -DGMS_FILE_NAME=\".graal.cfg\" \
-         -DGRAAL_WINDOW_DX=\"GRAAL_WINDOW_DX\" \
-         -DGRAAL_WINDOW_DY=\"GRAAL_WINDOW_DY\" \
-         -DGRAAL_WINDOW_XMIN=\"GRAAL_WINDOW_XMIN\" \
-         -DGRAAL_WINDOW_YMIN=\"GRAAL_WINDOW_YMIN\" \
-         -DGRAAL_WINDOW_SIDE=\"GRAAL_WINDOW_SIDE\" 
+AM_CFLAGS    = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
+               -I$(top_srcdir)/mbk/src \
+               -I$(top_srcdir)/rds/src \
+               -I$(top_srcdir)/druc/src \
+               -DGRAAL_DEFAULT_TECHNO_NAME=\"etc/cmos.graal\" \
+               -DGMS_FILE_NAME=\".graal.cfg\" \
+               -DGRAAL_WINDOW_DX=\"GRAAL_WINDOW_DX\" \
+               -DGRAAL_WINDOW_DY=\"GRAAL_WINDOW_DY\" \
+               -DGRAAL_WINDOW_XMIN=\"GRAAL_WINDOW_XMIN\" \
+               -DGRAAL_WINDOW_YMIN=\"GRAAL_WINDOW_YMIN\" \
+               -DGRAAL_WINDOW_SIDE=\"GRAAL_WINDOW_SIDE\" 
 
 # -----------------------------------------------------------------------------
 # X Libraries.
@@ -49,16 +49,10 @@ ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXT) $(LIBXPM) \
 
 
 graal_LDADD = @ALLIANCE_LIBS@ $(ALL_X_LIBS) \
--L$(top_builddir)/druc/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkap/src \
--L$(top_builddir)/mbkmg/src \
--L$(top_builddir)/mbkvti/src \
--L$(top_builddir)/rds/src \
--L$(top_builddir)/rdscif/src \
--L$(top_builddir)/rdsgds/src \
--lVrd -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu \
--lMap -lMmg -lMcp -lMph -lMut
+              -L$(top_builddir)/druc/src \
+              -L$(top_builddir)/mbk/src \
+              -L$(top_builddir)/rds/src \
+              -lVrd -lRds -lMpu -lMph -lMut
 
 graal_SOURCES = \
 graal.c GMC_create.c GMC_create.h GMC_dialog.c GMC_dialog.h GMC.h GMC_menu.c GMC_menu.h \

alliance/src/l2p/src/Makefile.am

@@ -2,28 +2,13 @@
 
 bin_PROGRAMS = l2p
 
-AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src \
--I$(top_srcdir)/rds/src
+AM_CFLAGS    = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src \
+               -I$(top_srcdir)/rds/src
 
-l2p_LDADD = @ALLIANCE_LIBS@ \
--L$(top_srcdir)/mbk/src \
--L$(top_srcdir)/mbkal/src \
--L$(top_srcdir)/mbkap/src \
--L$(top_srcdir)/mbkedif/src \
--L$(top_srcdir)/mbkhilo/src \
--L$(top_srcdir)/mbkmg/src \
--L$(top_srcdir)/mbkspice/src \
--L$(top_srcdir)/mbkvhdlg/src \
--L$(top_srcdir)/mbkvrlog/src \
--L$(top_srcdir)/mbkvti/src \
--L$(top_srcdir)/rds/src \
--L$(top_srcdir)/rdscif/src \
--L$(top_srcdir)/rdsgds/src \
- -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
- -lMhl -lMvg -lMlo -lMph -lMut -lMal -lRcn \
- -lMsl -lMgl \
- -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds
+l2p_LDADD    = @ALLIANCE_LIBS@ \
+               -L$(top_srcdir)/mbk/src \
+               -L$(top_srcdir)/rds/src \
+               -lMlu -lMpu -lMlo -lMph -lMut -lRds
 
-l2p_SOURCES = \
-drive_ps.c  rps_inc.h   tmp_man.c \
-dict_color.ps  l2p.c	   tmp_dict.c
+l2p_SOURCES  = drive_ps.c  rps_inc.h   tmp_man.c \
+               dict_color.ps  l2p.c	   tmp_dict.c

alliance/src/log/src/Makefile.am

@@ -1,8 +1,7 @@
 AM_CFLAGS           = -I$(top_srcdir)/mbk/src
 lib_LTLIBRARIES     = libLog.la
 include_HEADERS     = log.h
-libLog_la_SOURCES   = \
-log_bdd0.c  log.h	   log_thashbdd.c  log_thashloc.c \
-log_bdd1.c  log_prefbib.c  log_thash.c
-
-libLog_la_LDFLAGS = -version-info @LOG_DLL_VERSION@
+libLog_la_SOURCES   = log_bdd0.c  log.h	log_thashbdd.c  log_thashloc.c \
+                      log_bdd1.c  log_prefbib.c  log_thash.c
+libLog_la_LDFLAGS   = -version-info @LOG_DLL_VERSION@
+libLog_la_LIBADD    = -lMut

alliance/src/loon/src/Makefile.am

@@ -18,14 +18,7 @@ loon_LDADD = @ALLIANCE_LIBS@ \
 -L$(top_builddir)/aut/src \
 -L$(top_builddir)/bdd/src \
 -L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkal/src \
--L$(top_builddir)/mbkedif/src \
--L$(top_builddir)/mbkhilo/src \
--L$(top_builddir)/mbkspice/src \
--L$(top_builddir)/mbkvhdlg/src \
--L$(top_builddir)/mbkvrlog/src \
--L$(top_builddir)/mbkvti/src \
-          -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvg -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
+          -lAbv -lAbe -lAbt -lMlu -lMlo -lBdd -lAbl -lAut -lMut
 	   
 loon_SOURCES = \
 lon_lax_param.c           lon_lib_utils.c           lon_optim_capa.h \

alliance/src/lvx/src/Makefile.am

@@ -4,23 +4,7 @@ bin_PROGRAMS = lvx
 AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src
 
 lvx_LDADD = @ALLIANCE_LIBS@ \
--L$(top_srcdir)/mbk/src \
--L$(top_srcdir)/mbkal/src \
--L$(top_srcdir)/mbkedif/src \
--L$(top_srcdir)/mbkhilo/src \
--L$(top_srcdir)/mbkspice/src \
--L$(top_srcdir)/mbkvhdlg/src \
--L$(top_srcdir)/mbkvrlog/src \
--L$(top_srcdir)/mbkvti/src \
-          -lMlu \
-	  -lMcl \
-	  -lMal \
-	  -lMsl \
-	  -lMel -lMgl \
-	  -lMhl \
-	  -lMvg \
-	  -lMlo \
-	  -lMut \
-	  -lRcn 
+            -L$(top_srcdir)/mbk/src \
+            -lMlu -lMlo -lMut -lRcn 
 	   
 lvx_SOURCES = lvx.c

alliance/src/lynx/src/Makefile.am

@@ -1,56 +1,28 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = cougar flatrds
+bin_PROGRAMS    = cougar flatrds
 
-AM_CFLAGS = @ALLIANCE_CFLAGS@ -I$(top_srcdir)/mbk/src \
--I$(top_srcdir)/rds/src
+AM_CFLAGS       = @ALLIANCE_CFLAGS@ \
+                  -I$(top_srcdir)/mbk/src \
+                  -I$(top_srcdir)/rds/src
 
-cougar_LDADD = @ALLIANCE_LIBS@ \
--L$(top_srcdir)/mbk/src \
--L$(top_srcdir)/mbkal/src \
--L$(top_srcdir)/mbkap/src \
--L$(top_srcdir)/mbkedif/src \
--L$(top_srcdir)/mbkhilo/src \
--L$(top_srcdir)/mbkmg/src \
--L$(top_srcdir)/mbkspice/src \
--L$(top_srcdir)/mbkvhdl/src \
--L$(top_srcdir)/mbkvrlog/src \
--L$(top_srcdir)/mbkvti/src \
--L$(top_srcdir)/rds/src \
--L$(top_srcdir)/rdscif/src \
--L$(top_srcdir)/rdsgds/src \
- -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds \
- -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
- -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
- -lMsl -lMgl
+cougar_LDADD    = @ALLIANCE_LIBS@ \
+                  -L$(top_srcdir)/mbk/src \
+                  -L$(top_srcdir)/rds/src \
+                  -lRds -lMlu -lMpu -lMlo -lMph -lMut 
 
-flatrds_LDADD = @ALLIANCE_LIBS@ \
--L$(top_srcdir)/mbk/src \
--L$(top_srcdir)/mbkal/src \
--L$(top_srcdir)/mbkap/src \
--L$(top_srcdir)/mbkedif/src \
--L$(top_srcdir)/mbkhilo/src \
--L$(top_srcdir)/mbkmg/src \
--L$(top_srcdir)/mbkspice/src \
--L$(top_srcdir)/mbkvhdl/src \
--L$(top_srcdir)/mbkvrlog/src \
--L$(top_srcdir)/mbkvti/src \
--L$(top_srcdir)/rds/src \
--L$(top_srcdir)/rdscif/src \
--L$(top_srcdir)/rdsgds/src \
- -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds \
- -lMlu -lMpu -lMap -lMmg -lMcp -lMcl -lMel \
- -lMhl -lMvl -lMlo -lMph -lMut -lMal -lRcn \
- -lMsl -lMgl
+flatrds_LDADD   = @ALLIANCE_LIBS@ \
+                  -L$(top_srcdir)/mbk/src \
+                  -L$(top_srcdir)/rds/src \
+                  -lRds -lMlu -lMpu -lMlo -lMph -lMut 
 
 flatrds_SOURCES = flatrds.c
 
-cougar_SOURCES = \
-addlynxrcn.c addlynxrcn.h box.c box.h buildrcn.c \
-buildrcn.h bulk.c bulk.h chklynxrcn.c chklynxrcn.h \
-cutelbow.c cutelbow.h diffusion.c diffusion.h error.c \
-error.h extract.c extract.h hole.c \
-hole.h inter.c inter.h interval.c interval.h \
-lynx.c lynx.h lynxrcn.h mbkrds.c mbkrds.h netlist.c \
-netlist.h parse.c parse.h pattern.c pattern.h via.h \
-Windows95.c Windows95.h znc.c znc.h
+cougar_SOURCES  = addlynxrcn.c addlynxrcn.h box.c box.h buildrcn.c \
+                  buildrcn.h bulk.c bulk.h chklynxrcn.c chklynxrcn.h \
+                  cutelbow.c cutelbow.h diffusion.c diffusion.h error.c \
+                  error.h extract.c extract.h hole.c \
+                  hole.h inter.c inter.h interval.c interval.h \
+                  lynx.c lynx.h lynxrcn.h mbkrds.c mbkrds.h netlist.c \
+                  netlist.h parse.c parse.h pattern.c pattern.h via.h \
+                  Windows95.c Windows95.h znc.c znc.h

alliance/src/m2e/src/Makefile.am

@@ -2,32 +2,10 @@
 
 AM_CFLAGS    = -g -I$(top_srcdir)/mbk/src
 
-
 bin_PROGRAMS = m2e
 
-m2e_LDADD    = \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkal/src \
--L$(top_builddir)/mbkap/src \
--L$(top_builddir)/mbkedif/src \
--L$(top_builddir)/mbkhilo/src \
--L$(top_builddir)/mbkmg/src \
--L$(top_builddir)/mbkspice/src \
--L$(top_builddir)/mbkvhdlg/src \
--L$(top_builddir)/mbkvrlog/src \
--L$(top_builddir)/mbkvti/src \
--lMpu -lMlu  \
-               -lMcl -lMcp  \
-               -lMal -lMap  \
-               -lMsl        \
-               -lMel -lMgl  \
-               -lMhl        \
-               -lMvg        \
-               -lMmg        \
-               -lMlo        \
-               -lMph -lMut  \
-               -lRcn -lm
-
+m2e_LDADD    = -L$(top_builddir)/mbk/src \
+               -lMpu -lMlu -lMlo -lMph -lMut -lRcn -lm
 
 m2e_SOURCES  = m2e.c m2e.h
 

alliance/src/mbk/configure.in

@@ -52,6 +52,8 @@ AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h)
 AC_C_CONST
 AC_TYPE_SIGNAL
 AC_FUNC_VFORK
+AC_PROG_YACC
+AC_PROG_LEX
 dnl AM_PROG_LIBTOOL
 AM_PROG_LIBTOOL
 

alliance/src/mbk/src/Makefile.am

@@ -1,12 +1,32 @@
-AM_CFLAGS         =
+AM_CFLAGS         = -DTECHNO=\"symbolic_cmos\"
+YFLAGS            = -d
 
-lib_LTLIBRARIES   = libMph.la libMpu.la libMlo.la libMlu.la libMut.la libRcn.la
-include_HEADERS   = mlu.h mlo.h mpu.h mph.h mut.h rcn.h
+lib_LTLIBRARIES   = libMut.la libMph.la libMpu.la libRcn.la libMlo.la libMlu.la
+include_HEADERS   = mlu.h mlo.h mpu.h mph.h mut.h rcn.h msl.h
 
 libMph_la_SOURCES = mbk_ph.c mbk_ph.h
-libMpu_la_SOURCES = mbk_ph_util.c mbk_ph_util.h
+libMpu_la_SOURCES = mbk_ph_util.c mbk_ph_util.h \
+                    alc_driv_p.c alc_pars_p.c map.h \
+                    drive_vti_p.c drive_vti_p.h parse_vti_p.c mcp.h \
+                    mbk2mg.c mg2mbk_y.y mg2mbk_l.l mmg.h
 libMlo_la_SOURCES = mbk_lo.c mbk_lo.h
-libMlu_la_SOURCES = mbk_lo_util.c mbk_lo_util.h
+libMlu_la_SOURCES = mbk_lo_util.c mbk_lo_util.h \
+                    alc_driv_l.c alc_pars_l.c alc_pars_l6.c mal.h \
+                    drive_vti_l.c  drive_vti_l.h  parse_vti_l.c \
+                    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 \
+                    spi_msg.h spi_parse.c spi_parse.h msl.h \
+                    time.c driver.c parser_y.y parser_l.l \
+                    drive_hilo.c \
+                    mvl_drive.c mvl_parse.c mvl_util.c mvl_sspec.c \
+                    mvl_scomp_y.y mvl_scomp_l.l \
+                    mvl_drive.h mvl_parse.h mvl_scomp_y.h mvl_slex.h \
+                    mvl_sspec.h mvl_stdef.h mvl_stype.h mvl_syacc.h \
+                    mvl_utdef.h mvl_util.h mvl_utype.h \
+                    vel_chain.c  vel_sort.c  vel_vect.c vel_drive.c  vel_o.c vel_util.c  vel_velo.h \
+                    gen_generic.c  gen_generic.h  gen_print.c \
+                    drive_vlog.c
+
 libMut_la_SOURCES = mbk_sys.c mbk_sys.h mbk_util.c mbk_util.h
 libRcn_la_SOURCES = rcn_lo.c  rcn_lo.h  rcn_lo_util.c
 
@@ -16,3 +36,35 @@ libMlo_la_LDFLAGS = -version-info @MBK_DLL_VERSION@
 libMlu_la_LDFLAGS = -version-info @MBK_DLL_VERSION@
 libMut_la_LDFLAGS = -version-info @MBK_DLL_VERSION@
 libRcn_la_LDFLAGS = -version-info @MBK_DLL_VERSION@
+
+libMph_la_LIBADD  = libMut.la
+libMpu_la_LIBADD  = libMut.la libMph.la
+libMlo_la_LIBADD  = libMut.la libRcn.la
+libMlu_la_LIBADD  = libMut.la libMlo.la
+libMut_la_LIBADD  =
+libRcn_la_LIBADD  = libMut.la
+
+CLEANFILES        = mg2mbk_y.c mg2mbk_y.h mg2mbk_l.c \
+                    parser_y.c parser_y.h parser_l.c \
+                    mvl_scomp_y.c mvl_scomp_y.h mvl_scomp_l.c
+
+mg2mbk_y.c mg2mbk_y.h : $(srcdir)/mg2mbk_y.y
+	$(YACC) $(YFLAGS) $(srcdir)/mg2mbk_y.y && \
+	sed -e "s/yy/mgn/g" -e "s/YY/MGN/g" y.tab.c > mg2mbk_y.c && \
+	sed -e "s/yy/mgn/g" -e "s/YY/MGN/g" y.tab.h > mg2mbk_y.h
+mg2mbk_l.c : $(srcdir)/mg2mbk_l.l mg2mbk_y.h
+	$(LEX) -t $(srcdir)/mg2mbk_l.l | sed -e "s/yy/mgn/g" -e "s/YY/MGN/g" > mg2mbk_l.c
+
+parser_y.c parser_y.h : $(srcdir)/parser_y.y
+	$(YACC) $(YFLAGS) $(srcdir)/parser_y.y && \
+	sed -e "s/yy/edif/g" -e "s/YY/EDIF/g" y.tab.c > parser_y.c && \
+	sed -e "s/yy/edif/g" -e "s/YY/EDIF/g" y.tab.h > parser_y.h
+parser_l.c : $(srcdir)/parser_l.l parser_y.h
+	$(LEX) -t $(srcdir)/parser_l.l | sed -e "s/yy/edif/g" -e "s/YY/EDIF/g" > parser_l.c
+
+mvl_scomp_y.c mvl_scomp_y.h : $(srcdir)/mvl_scomp_y.y
+	$(YACC) $(YFLAGS) $(srcdir)/mvl_scomp_y.y && \
+	sed -e "s/yy/mvl_y_/g" -e "s/YY/MVL_Y_/g" y.tab.c > mvl_scomp_y.c && \
+	sed -e "s/yy/mvl_y_/g" -e "s/YY/MVL_Y_/g" y.tab.h > mvl_scomp_y.h
+mvl_scomp_l.c : $(srcdir)/mvl_scomp_l.l mvl_scomp_y.h
+	$(LEX) -t $(srcdir)/mvl_scomp_l.l | sed -e "s/yy/mvl_y_/g" -e "s/YY/MVL_Y_/g" > mvl_scomp_l.c