From 45eb666afa358665b0a3a38ac5b4f7f93b7e5641 Mon Sep 17 00:00:00 2001 From: Roselyne Chotin-Avot Date: Mon, 6 Aug 2018 16:47:32 +0200 Subject: [PATCH] Add shared libraries directories to Makefile.am for link before install Move extern variables to headers to be compatible with clang --- alliance/src/abe/src/Makefile.am | 2 +- alliance/src/abl/src/Makefile.am | 2 +- alliance/src/abt/src/Makefile.am | 3 ++- alliance/src/abv/src/Makefile.am | 6 +++--- alliance/src/asimut/src/Makefile.am | 2 +- alliance/src/bdd/src/Makefile.am | 2 +- alliance/src/beh/src/Makefile.am | 3 ++- alliance/src/bhl/src/Makefile.am | 2 +- alliance/src/btr/src/Makefile.am | 2 +- alliance/src/bvl/src/Makefile.am | 6 +++--- alliance/src/ctl/src/Makefile.am | 2 +- alliance/src/ctp/src/Makefile.am | 8 ++++---- alliance/src/druc/src/Makefile.am | 2 +- alliance/src/elp/src/Makefile.am | 2 +- alliance/src/elp/src/elp.c | 1 - alliance/src/elp/src/elp.h | 3 ++- alliance/src/elp/src/elp_y.y | 1 - alliance/src/fks/src/Makefile.am | 3 ++- alliance/src/fsm/src/Makefile.am | 2 +- alliance/src/ftl/src/Makefile.am | 4 +++- alliance/src/fvh/src/Makefile.am | 9 +++++---- alliance/src/genlib/src/Makefile.am | 2 +- alliance/src/genpat/src/Makefile.am | 2 +- alliance/src/gscr/src/Makefile.am | 2 +- alliance/src/gscr/src/gscr_GreedyRout.c | 1 + alliance/src/gscr/src/gscr_greedy.h | 4 +--- alliance/src/log/src/Makefile.am | 2 +- alliance/src/mbk/src/Makefile.am | 18 ++++++++--------- alliance/src/mips_asm/src/Makefile.am | 4 ++-- alliance/src/pat/src/Makefile.am | 26 ++++++++++++------------- alliance/src/pat/src/pat_decl_l.l | 5 ----- alliance/src/rtd/src/Makefile.am | 2 +- alliance/src/rtn/src/Makefile.am | 2 +- alliance/src/scl/src/Makefile.am | 2 +- alliance/src/scr/src/main.c | 2 +- alliance/src/scr/src/scr_grammar.y | 2 +- alliance/src/vbh/src/Makefile.am | 5 +++-- alliance/src/vex/src/Makefile.am | 2 +- alliance/src/vpn/src/Makefile.am | 2 +- alliance/src/xgra/src/XSB_parse.c | 2 +- 40 files changed, 77 insertions(+), 77 deletions(-) diff --git a/alliance/src/abe/src/Makefile.am b/alliance/src/abe/src/Makefile.am index 8b296387..2da34bea 100644 --- a/alliance/src/abe/src/Makefile.am +++ b/alliance/src/abe/src/Makefile.am @@ -3,5 +3,5 @@ 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_LDFLAGS = -version-info @ABE_DLL_VERSION@ -L../../abl/src -L../../aut/src -L../../mbk/src libAbe_la_LIBADD = -lAbl -lAut -lMut diff --git a/alliance/src/abl/src/Makefile.am b/alliance/src/abl/src/Makefile.am index bae65f36..c332d426 100644 --- a/alliance/src/abl/src/Makefile.am +++ b/alliance/src/abl/src/Makefile.am @@ -11,5 +11,5 @@ libAbl_la_SOURCES = abldel.h ablflat.h abloptim.h ablunflat.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_LDFLAGS = -version-info @ABL_DLL_VERSION@ -L../../aut/src libAbl_la_LIBADD = -lAut -lMut diff --git a/alliance/src/abt/src/Makefile.am b/alliance/src/abt/src/Makefile.am index 28da65dd..6511acd0 100644 --- a/alliance/src/abt/src/Makefile.am +++ b/alliance/src/abt/src/Makefile.am @@ -8,5 +8,6 @@ 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_LDFLAGS = -version-info @ABT_DLL_VERSION@ -L../../bdd/src \ + -L../../abe/src -L../../abl/src -L../../aut/src -L../../mbk/src libAbt_la_LIBADD = -lBdd -lAbe -lAbl -lAut -lMut diff --git a/alliance/src/abv/src/Makefile.am b/alliance/src/abv/src/Makefile.am index 73e5fdbe..8b7c6e91 100644 --- a/alliance/src/abv/src/Makefile.am +++ b/alliance/src/abv/src/Makefile.am @@ -15,9 +15,9 @@ 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 + $(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 bvl_bcomp_l.c : $(srcdir)/bvl_bcomp_l.l bvl_bcomp_y.h - $(LEX) -t $(srcdir)/bvl_bcomp_l.l | sed -e "s/yy/bvl_y_/g" -e "s/YY/BVL_Y_/g" > bvl_bcomp_l.c + $(LEX) -t $(srcdir)/bvl_bcomp_l.l | $(SED) -e "s/yy/bvl_y_/g" -e "s/YY/BVL_Y_/g" > bvl_bcomp_l.c -libAbv_la_LDFLAGS = -version-info @ABV_DLL_VERSION@ +libAbv_la_LDFLAGS = -version-info @ABV_DLL_VERSION@ -L../../abe/src -L../../bdd/src -L../../mbk/src diff --git a/alliance/src/asimut/src/Makefile.am b/alliance/src/asimut/src/Makefile.am index 20847b5a..7bfb4978 100644 --- a/alliance/src/asimut/src/Makefile.am +++ b/alliance/src/asimut/src/Makefile.am @@ -16,7 +16,7 @@ libSch_la_SOURCES = sch_addshent.c sch_CrtSch.c sch_GetCTim.c sch.h sch_r 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_LDFLAGS = -version-info @SCH_DLL_VERSION@ +libSch_la_LDFLAGS = -version-info @SCH_DLL_VERSION@ -L../../mbk/src libSch_la_LIBADD = -lMut bin_PROGRAMS = asimut diff --git a/alliance/src/bdd/src/Makefile.am b/alliance/src/bdd/src/Makefile.am index 8b4df4e6..8dbea95a 100644 --- a/alliance/src/bdd/src/Makefile.am +++ b/alliance/src/bdd/src/Makefile.am @@ -24,5 +24,5 @@ libBdd_la_SOURCES = bdd.h bddenv.h bddimply.h bddsimp 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@ -L../../abl/src -L../../mbk/src libBdd_la_LIBADD = -lAbl -lAut diff --git a/alliance/src/beh/src/Makefile.am b/alliance/src/beh/src/Makefile.am index f087c949..458e6f06 100644 --- a/alliance/src/beh/src/Makefile.am +++ b/alliance/src/beh/src/Makefile.am @@ -24,5 +24,6 @@ libBeh_la_SOURCES = beh_addbeaux.c beh_delbebus.c beh_frebeaux.c beh_mess 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@ -L../../log/src -L../../mbk/src \ + -L../../abl/src -L../../aut/src -L../../mbk/src libBeh_la_LIBADD = -lLog -lAbl -lAut -lMut diff --git a/alliance/src/bhl/src/Makefile.am b/alliance/src/bhl/src/Makefile.am index 1d520024..8a0011cd 100644 --- a/alliance/src/bhl/src/Makefile.am +++ b/alliance/src/bhl/src/Makefile.am @@ -6,5 +6,5 @@ libBhl_la_SOURCES = beh_chkbefig.c beh_dly2sta.c beh_makbdd.c beh_makvarlis 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_LDFLAGS = -version-info @BHL_DLL_VERSION@ -L../../beh/src -L../../aut/src -L../../mbk/src libBhl_la_LIBADD = -lBeh -lAut -lMut diff --git a/alliance/src/btr/src/Makefile.am b/alliance/src/btr/src/Makefile.am index d9eb2c34..ee2ed63a 100644 --- a/alliance/src/btr/src/Makefile.am +++ b/alliance/src/btr/src/Makefile.am @@ -4,5 +4,5 @@ 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_LDFLAGS = -version-info @BTR_DLL_VERSION@ -L../../bdd/src -L../../aut/src libBtr_la_LIBADD = -lBdd diff --git a/alliance/src/bvl/src/Makefile.am b/alliance/src/bvl/src/Makefile.am index 5d81aec9..39468862 100644 --- a/alliance/src/bvl/src/Makefile.am +++ b/alliance/src/bvl/src/Makefile.am @@ -4,12 +4,12 @@ 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_LDFLAGS = -version-info @BVL_DLL_VERSION@ -L../../bhl/src -L../../beh/src -L../../mbk/src libBvl_la_LIBADD = -lBhl -lBeh -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 + $(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 bvl_bcomp_l.c : $(srcdir)/bvl_bcomp_l.l bvl_bcomp_y.h - $(LEX) -t $(srcdir)/bvl_bcomp_l.l | sed -e "s/yy/bvl_y_/g" -e "s/YY/BVL_Y_/g" > bvl_bcomp_l.c + $(LEX) -t $(srcdir)/bvl_bcomp_l.l | $(SED) -e "s/yy/bvl_y_/g" -e "s/YY/BVL_Y_/g" > bvl_bcomp_l.c diff --git a/alliance/src/ctl/src/Makefile.am b/alliance/src/ctl/src/Makefile.am index b4c6000e..3e95b0dd 100644 --- a/alliance/src/ctl/src/Makefile.am +++ b/alliance/src/ctl/src/Makefile.am @@ -4,5 +4,5 @@ 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_LDFLAGS = -version-info @CTL_DLL_VERSION@ -L../../mbk/src -L../../aut/src -L../../vex/src libCtl_la_LIBADD = -lVex -lAut -lMut diff --git a/alliance/src/ctp/src/Makefile.am b/alliance/src/ctp/src/Makefile.am index 165e5821..1a98d607 100644 --- a/alliance/src/ctp/src/Makefile.am +++ b/alliance/src/ctp/src/Makefile.am @@ -4,7 +4,7 @@ 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_LDFLAGS = -version-info @CTP_DLL_VERSION@ -L../../ctl/src -L../../vex/src -L../../aut/src -L../../mbk/src libCtp_la_LIBADD = -lCtl -lVex -lAut -lMut CLEANFILES = ctp_y.c ctp_y.h ctp_l.c @@ -12,10 +12,10 @@ 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 + $(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 + $(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 diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am index 7f8ae99c..b3801865 100644 --- a/alliance/src/druc/src/Makefile.am +++ b/alliance/src/druc/src/Makefile.am @@ -9,7 +9,7 @@ vmcasmld.c vmcasmld.h vmcerror.c vmcerror.h vmcmesur.c vmcmesur.h vmcrelat.c \ vmcrelat.h vmctools.c vmctools.h vmcunify.c vmcunify.h CFLAGS = $(ALLIANCE_CFLAGS) -g -O0 -libVrd_la_LDFLAGS = -version-info @VRD_DLL_VERSION@ +libVrd_la_LDFLAGS = -version-info @VRD_DLL_VERSION@ -L../../rds/src -L../../mbk/src libVrd_la_LIBADD = -lRds -lMut -lMph CLEANFILES = drucompi_l.c drucompi_y.h drucompi_y.c diff --git a/alliance/src/elp/src/Makefile.am b/alliance/src/elp/src/Makefile.am index 41969abb..3a2d663d 100644 --- a/alliance/src/elp/src/Makefile.am +++ b/alliance/src/elp/src/Makefile.am @@ -4,7 +4,7 @@ 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_LDFLAGS = -version-info @ELP_DLL_VERSION@ +libElp_la_LDFLAGS = -version-info @ELP_DLL_VERSION@ -L../../mbk/src libElp_la_LIBADD = -lRcn -lMut CLEANFILES = elp_y.c elp_y.h elp_l.c diff --git a/alliance/src/elp/src/elp.c b/alliance/src/elp/src/elp.c index d279e6cf..e516f1ee 100644 --- a/alliance/src/elp/src/elp.c +++ b/alliance/src/elp/src/elp.c @@ -33,7 +33,6 @@ double elpVoltage[elpVOLTNUM] ; double elpCapa[elpTRANSNUM][elpCAPANUM] ; double elpGeneral[elpGENERALNUM] = {0.0,0.0,1000.0} ; char elpLang = elpDEFLANG ; -int elpyylineno ; /*****************************************************************************/ /* function elpenv() */ diff --git a/alliance/src/elp/src/elp.h b/alliance/src/elp/src/elp.h index b1d4930f..b1f284ae 100644 --- a/alliance/src/elp/src/elp.h +++ b/alliance/src/elp/src/elp.h @@ -106,7 +106,8 @@ extern double elpGeneral[elpGENERALNUM] ; #define elpACM 0 /* methode de calcul des capacites dynamiques */ #define elpTEMP 1 /* temperature de simulation et d'analyse */ #define elpSLOPE 2 /* front sur les connecteurs d'entree */ - +extern int yylineno ; +extern int elpyylineno ; /* les fonctions externes */ extern int elpenv() ; diff --git a/alliance/src/elp/src/elp_y.y b/alliance/src/elp/src/elp_y.y index 904ce7f0..fb5db214 100644 --- a/alliance/src/elp/src/elp_y.y +++ b/alliance/src/elp/src/elp_y.y @@ -100,7 +100,6 @@ elpvar : ; %% -extern int yylineno ; extern char yytext[] ; void yyerror() diff --git a/alliance/src/fks/src/Makefile.am b/alliance/src/fks/src/Makefile.am index 49f46bab..97e44317 100644 --- a/alliance/src/fks/src/Makefile.am +++ b/alliance/src/fks/src/Makefile.am @@ -6,5 +6,6 @@ AM_CFLAGS = -I$(top_srcdir)/mbk/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_LDFLAGS = -version-info @FKS_DLL_VERSION@ -L../../fsm/src -L../../abl/src -L../../bdd/src \ + -L../../aut/src -L../../mbk/src libFks_la_LIBADD = -lFsm -lAbl -lBdd -lAut -lMut diff --git a/alliance/src/fsm/src/Makefile.am b/alliance/src/fsm/src/Makefile.am index 47f639a7..ed669741 100644 --- a/alliance/src/fsm/src/Makefile.am +++ b/alliance/src/fsm/src/Makefile.am @@ -5,5 +5,5 @@ libFsm_la_SOURCES = fsm.h fsmalloc.h fsmdel.h fsmfree.h fsmsearch.h f 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_LDFLAGS = -version-info @FSM_DLL_VERSION@ -L../../bdd/src -L../../abl/src -L../../aut/src -L../../mbk/src libFsm_la_LIBADD = -lBdd -lAbl -lAut -lMut diff --git a/alliance/src/ftl/src/Makefile.am b/alliance/src/ftl/src/Makefile.am index b50d0ad1..f017b7ee 100644 --- a/alliance/src/ftl/src/Makefile.am +++ b/alliance/src/ftl/src/Makefile.am @@ -6,7 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/mbk/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_LDFLAGS = -version-info @FTL_DLL_VERSION@ -L../../fks/src -L../../fvh/src \ + -L../../fsm/src -L../../bdd/src -L../../abl/src -L../../aut/src \ + -L../../mbk/src libFtl_la_LIBADD = -lFks -lFvh -lFsm -lBdd -lAbl -lAut -lMut EXTRA_PROGRAMS = fsmtest diff --git a/alliance/src/fvh/src/Makefile.am b/alliance/src/fvh/src/Makefile.am index 29a3a319..b1fb7960 100644 --- a/alliance/src/fvh/src/Makefile.am +++ b/alliance/src/fvh/src/Makefile.am @@ -13,14 +13,15 @@ libFvh_la_SOURCES = fbl_bcomp_y.y fbl_bcomp_l.l \ 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@ -L../../fsm/src -L../../abl/src \ + -L../../bdd/src -L../../aut/src -L../../mbk/src 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 + $(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 + $(LEX) -t $(srcdir)/fbl_bcomp_l.l | $(SED) -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" > fbl_bcomp_l.c diff --git a/alliance/src/genlib/src/Makefile.am b/alliance/src/genlib/src/Makefile.am index 5ed34631..08847ef5 100644 --- a/alliance/src/genlib/src/Makefile.am +++ b/alliance/src/genlib/src/Makefile.am @@ -25,7 +25,7 @@ libMgn_la_SOURCES = genlib.c \ dpgen_uROM.c \ dpgen_Shifter.c -libMgn_la_LDFLAGS = -version-info @MGN_DLL_VERSION@ +libMgn_la_LDFLAGS = -version-info @MGN_DLL_VERSION@ -L../../mbk/src libMgn_la_LIBADD = -lMlu -lMlo -lMpu -lMph -lMut bin_SCRIPTS = genlib diff --git a/alliance/src/genpat/src/Makefile.am b/alliance/src/genpat/src/Makefile.am index 8a816227..359e3b42 100644 --- a/alliance/src/genpat/src/Makefile.am +++ b/alliance/src/genpat/src/Makefile.am @@ -7,7 +7,7 @@ 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_LDFLAGS = -version-info @PGN_DLL_VERSION@ -L../../pat/src -L../../mbk/src libPgn_la_LIBADD = -lPat -lMut bin_SCRIPTS = genpat diff --git a/alliance/src/gscr/src/Makefile.am b/alliance/src/gscr/src/Makefile.am index 3d126406..470b4126 100644 --- a/alliance/src/gscr/src/Makefile.am +++ b/alliance/src/gscr/src/Makefile.am @@ -13,7 +13,7 @@ libApr_la_SOURCES = gscr_greedy.h gscr_StaticUtil.h scp_inits.h scp_modif.h gscr_main.h scp_channel.h scp_mbk2scp.h scp_scp2mbk.h gscr_DynamicUtil.h \ gscr_StaticUtil.c scp_inits.c scp_modif.c scp_time.c -#libApr_la_LDFLAGS = -version-info @APR_DLL_VERSION@ +libApr_la_LDFLAGS = -version-info @APR_DLL_VERSION@ -L../../mbk/src libApr_la_LIBADD = -lMut -lMph -lMlo diff --git a/alliance/src/gscr/src/gscr_GreedyRout.c b/alliance/src/gscr/src/gscr_GreedyRout.c index abda6b1c..bfb59dfa 100644 --- a/alliance/src/gscr/src/gscr_GreedyRout.c +++ b/alliance/src/gscr/src/gscr_GreedyRout.c @@ -36,6 +36,7 @@ # include "gscr_DynamicUtil.h" long EndPattern = LEADPATTERN; +BOOLEAN TOPNOTROUT, BOTNOTROUT; /******************************************************************************/ /* SCR_SplitNet Modul of Initialisation */ /******************************************************************************/ diff --git a/alliance/src/gscr/src/gscr_greedy.h b/alliance/src/gscr/src/gscr_greedy.h index 8c037fe7..d6af2fe3 100644 --- a/alliance/src/gscr/src/gscr_greedy.h +++ b/alliance/src/gscr/src/gscr_greedy.h @@ -26,9 +26,7 @@ # define MINJOG_LENGTH ((long ) 1) # define LEADPATTERN 6 extern long EndPattern; -long TabRout[MAXCOL][MAXLINE]; - -BOOLEAN TOPNOTROUT, BOTNOTROUT; +extern long TabRout[MAXCOL][MAXLINE]; #define PREVHNET(I) TabRout[0][I] #define HNET(I) TabRout[1][I] diff --git a/alliance/src/log/src/Makefile.am b/alliance/src/log/src/Makefile.am index dc7e4e1c..70d2af9b 100644 --- a/alliance/src/log/src/Makefile.am +++ b/alliance/src/log/src/Makefile.am @@ -3,5 +3,5 @@ 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_LDFLAGS = -version-info @LOG_DLL_VERSION@ -L../../mbk/src libLog_la_LIBADD = -lMut diff --git a/alliance/src/mbk/src/Makefile.am b/alliance/src/mbk/src/Makefile.am index 38303415..91085fe9 100644 --- a/alliance/src/mbk/src/Makefile.am +++ b/alliance/src/mbk/src/Makefile.am @@ -50,21 +50,21 @@ CLEANFILES = mg2mbk_y.c mg2mbk_y.h mg2mbk_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 + $(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 + $(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 + $(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 + $(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 + $(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 + $(LEX) -t $(srcdir)/mvl_scomp_l.l | $(SED) -e "s/yy/mvl_y_/g" -e "s/YY/MVL_Y_/g" > mvl_scomp_l.c diff --git a/alliance/src/mips_asm/src/Makefile.am b/alliance/src/mips_asm/src/Makefile.am index f1bc6282..14422342 100644 --- a/alliance/src/mips_asm/src/Makefile.am +++ b/alliance/src/mips_asm/src/Makefile.am @@ -23,9 +23,9 @@ mips_asm_LDADD = @ALLIANCE_LIBS@ \ mips_asm_SOURCES = mips_defs.h mips_y.y mips_l.l mips_globals.c mips_lex.h mips_type.h mips_yacc.h mips_util.c mips_y.c mips_y.h : $(srcdir)/mips_y.y - $(YACC) -d $(YFLAGS) $(srcdir)/mips_y.y && sed -e "s/yy/mipsyy/g" -e "s/YY/mipsYY/g" y.tab.c > mips_y.c && sed -e "s/yy/mipsyy/g" -e "s/YY/mipsYY/g" y.tab.h > mips_y.h + $(YACC) -d $(YFLAGS) $(srcdir)/mips_y.y && $(SED) -e "s/yy/mipsyy/g" -e "s/YY/mipsYY/g" y.tab.c > mips_y.c && $(SED) -e "s/yy/mipsyy/g" -e "s/YY/mipsYY/g" y.tab.h > mips_y.h mips_l.c : $(srcdir)/mips_l.l mips_y.h - $(LEX) -t $(srcdir)/mips_l.l | sed -e "s/yy/mipsyy/g" -e "s/YY/mipsYY/g" > mips_l.c + $(LEX) -t $(srcdir)/mips_l.l | $(SED) -e "s/yy/mipsyy/g" -e "s/YY/mipsYY/g" > mips_l.c CLEANFILES = y.tab.c y.tab.h mips.c diff --git a/alliance/src/pat/src/Makefile.am b/alliance/src/pat/src/Makefile.am index ac409beb..41dcaf73 100644 --- a/alliance/src/pat/src/Makefile.am +++ b/alliance/src/pat/src/Makefile.am @@ -12,7 +12,7 @@ libPat_la_SOURCES = pat_addpacom.c pat_addpaevt.c pat_addpagrp.c pat_addpaini. pat_lodpaseq.c pat_pattostr.c pat_prspat.c pat_savpaseq.c \ pat_type.h ppt.h \ pat_debug.c pat_debug.h pat_getusage.c phl.h -libPat_la_LDFLAGS = -version-info @PAT_DLL_VERSION@ +libPat_la_LDFLAGS = -version-info @PAT_DLL_VERSION@ -L../../aut/src -L../../mbk/src libPat_la_LIBADD = -lAut -lMut EXTRADIST = pat_decl_y.c pat_decl_y.h pat_desc_y.h pat_desc_y.c \ @@ -23,25 +23,25 @@ CLEANFILES = pat_decl_y.c pat_decl_y.h pat_desc_y.h pat_desc_y.c \ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y $(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \ - && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \ - | sed -e "s/int[ ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \ - | sed -e "s/int[ ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \ + && $(SED) -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \ + | $(SED) -e "s/int[ ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \ + | $(SED) -e "s/int[ ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \ > pat_decl_y.c \ - && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h + && $(SED) -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h pat_decl_l.c : $(srcdir)/pat_decl_l.l pat_decl_y.h - $(LEX) -t $(srcdir)/pat_decl_l.l | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_decl_l.c + $(LEX) -t $(srcdir)/pat_decl_l.l | $(SED) -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_decl_l.c pat_desc_y.c pat_desc_y.h : $(srcdir)/pat_desc_y.y $(YACC) -d $(YFLAGS) $(srcdir)/pat_desc_y.y \ - && sed -e "s/yyparse/pat_desc_y_parse/g" y.tab.c \ - | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_desc_y.c \ - && sed -e "s/yyparse/pat_desc_y_parse/g" y.tab.h \ - | sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" > pat_desc_y.h + && $(SED) -e "s/yyparse/pat_desc_y_parse/g" y.tab.c \ + | $(SED) -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_y.c \ + && $(SED) -e "s/yyparse/pat_desc_y_parse/g" y.tab.h \ + | $(SED) -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_y.h -#sed -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_y.c && sed -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" y.tab.h > pat_desc_y.h -# sed -e "s/yyin/pat_decl_y_/g" -e "s/yylex/pat_decl_y_lex/g" y.tab.c | +#$(SED) -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_y.c && $(SED) -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" y.tab.h > pat_desc_y.h +# $(SED) -e "s/yyin/pat_decl_y_/g" -e "s/yylex/pat_decl_y_lex/g" y.tab.c | pat_desc_l.c : $(srcdir)/pat_desc_l.l pat_desc_y.h - $(LEX) -t $(srcdir)/pat_desc_l.l | sed -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_l.c + $(LEX) -t $(srcdir)/pat_desc_l.l | $(SED) -e "s/yy/pat_desc_y_/g" -e "s/YY/PAT_DESC_Y_/g" > pat_desc_l.c diff --git a/alliance/src/pat/src/pat_decl_l.l b/alliance/src/pat/src/pat_decl_l.l index 6bcd1822..5e7e6e16 100644 --- a/alliance/src/pat/src/pat_decl_l.l +++ b/alliance/src/pat/src/pat_decl_l.l @@ -41,11 +41,6 @@ #include "pat_type.h" #include "pat_decl_y.h" -extern int yychar; -extern YYSTYPE yylval; -extern int yynerrs; - - /* ICI LUDO #ifdef YY_DECL #undef YY_DECL diff --git a/alliance/src/rtd/src/Makefile.am b/alliance/src/rtd/src/Makefile.am index 509c9c8d..936d7591 100644 --- a/alliance/src/rtd/src/Makefile.am +++ b/alliance/src/rtd/src/Makefile.am @@ -6,5 +6,5 @@ lib_LTLIBRARIES = libRtd.la include_HEADERS = rtd.h libRtd_la_SOURCES = rtd.h rtd_drive.h rtd_error.h rtd_get.h rtd_parse.h \ rtd_drive.c rtd_error.c rtd_get.c rtd_parse.c -libRtd_la_LDFLAGS = -version-info @RTD_DLL_VERSION@ +libRtd_la_LDFLAGS = -version-info @RTD_DLL_VERSION@ -L../../rtn/src -L../../vex/src -L../../mbk/src libRtd_la_LIBADD = -lRtn -lVex -lMut diff --git a/alliance/src/rtn/src/Makefile.am b/alliance/src/rtn/src/Makefile.am index 0121f970..56a8a309 100644 --- a/alliance/src/rtn/src/Makefile.am +++ b/alliance/src/rtn/src/Makefile.am @@ -4,5 +4,5 @@ include_HEADERS = rtn.h libRtn_la_SOURCES = rtnadd.h rtndel.c rtnerror.h rtnget.c rtnsearch.h \ rtn.h rtnalloc.c rtndel.h rtnfree.c rtnget.h rtnview.c \ rtnadd.c rtnalloc.h rtnerror.c rtnfree.h rtnsearch.c rtnview.h -libRtn_la_LDFLAGS = -version-info @RTN_DLL_VERSION@ +libRtn_la_LDFLAGS = -version-info @RTN_DLL_VERSION@ -L../../vex/src -L../../aut/src -L../../mbk/src libRtn_la_LIBADD = -lVex -lAut -lMut diff --git a/alliance/src/scl/src/Makefile.am b/alliance/src/scl/src/Makefile.am index 77bf3646..d93abd65 100644 --- a/alliance/src/scl/src/Makefile.am +++ b/alliance/src/scl/src/Makefile.am @@ -10,5 +10,5 @@ libScl_la_SOURCES = scgmain.h schenv.c schget.h scpadd.h scpfree.c \ scglofig.c schalloc.h schfree.c scl.h scpbuild.h \ scglofig.h schdel.c schfree.h scp.h scpdel.c \ scgmain.c schdel.h schget.c scpadd.c scpdel.h -libScl_la_LDFLAGS = -version-info @SCL_DLL_VERSION@ +libScl_la_LDFLAGS = -version-info @SCL_DLL_VERSION@ -L../../abl/src -L../../aut/src -L../../mbk/src libScl_la_LIBADD = -lAbl -lAut -lMut diff --git a/alliance/src/scr/src/main.c b/alliance/src/scr/src/main.c index 568e8e5b..c9404ec2 100644 --- a/alliance/src/scr/src/main.c +++ b/alliance/src/scr/src/main.c @@ -61,7 +61,7 @@ # include "ViewDataBase.h" PlaceConList *LeadPlaceConList = NULL; -extern int L3MODE; +extern int L3MODE=0; extern int SXMODE; extern int SCR_RATIO; diff --git a/alliance/src/scr/src/scr_grammar.y b/alliance/src/scr/src/scr_grammar.y index ce040484..d3e80489 100644 --- a/alliance/src/scr/src/scr_grammar.y +++ b/alliance/src/scr/src/scr_grammar.y @@ -1,7 +1,7 @@ %{ #include #include -#include +#include # include # include # include diff --git a/alliance/src/vbh/src/Makefile.am b/alliance/src/vbh/src/Makefile.am index d017730e..f4265f6d 100644 --- a/alliance/src/vbh/src/Makefile.am +++ b/alliance/src/vbh/src/Makefile.am @@ -13,11 +13,12 @@ libVbh_la_SOURCES = vbh.h vbh_add.c vbh_crt.c vbh_dup.c vbh_fre.c vbh_simp vtl.h vtlacces.c vtlacces.h vtlerror.c vtlerror.h \ vpd.h vpd_drive.h vpd_error.h vpd_parse.h \ vpd_drive.c vpd_error.c vpd_parse.c +libVbh_la_LDFLAGS = -version-info @VBH_DLL_VERSION@ -L../../vpn/src -L../../vex/src -L../../aut/src -L../../mbk/src libVbh_la_LIBADD = -lVpn -lVex -lAut -lMut CLEANFILES = vbl_bcomp_y.c vbl_bcomp_y.h vbl_bcomp_l.c vbl_bcomp_y.c vbl_bcomp_y.h : $(srcdir)/vbl_bcomp_y.y - $(YACC) -d $(YFLAGS) $(srcdir)/vbl_bcomp_y.y && sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.c > vbl_bcomp_y.c && sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.h > vbl_bcomp_y.h + $(YACC) -d $(YFLAGS) $(srcdir)/vbl_bcomp_y.y && $(SED) -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.c > vbl_bcomp_y.c && $(SED) -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.h > vbl_bcomp_y.h vbl_bcomp_l.c : $(srcdir)/vbl_bcomp_l.l vbl_bcomp_y.h - $(LEX) -t $(srcdir)/vbl_bcomp_l.l | sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" > vbl_bcomp_l.c + $(LEX) -t $(srcdir)/vbl_bcomp_l.l | $(SED) -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" > vbl_bcomp_l.c diff --git a/alliance/src/vex/src/Makefile.am b/alliance/src/vex/src/Makefile.am index 167c80e8..8571a8c3 100644 --- a/alliance/src/vex/src/Makefile.am +++ b/alliance/src/vex/src/Makefile.am @@ -8,5 +8,5 @@ libVex_la_SOURCES = vexcreate.h vexerror.c vexfree.h vexshift.c vexunflat vexalloc.c vexdup.h vexextend.c vexis.h vexslice.c \ vexalloc.h vexenv.c vexextend.h vexoptim.c vexslice.h \ vexcreate.c vexenv.h vexfree.c vexoptim.h vexunflat.c -libVex_la_LDFLAGS = -version-info @VEX_DLL_VERSION@ +libVex_la_LDFLAGS = -version-info @VEX_DLL_VERSION@ -L../../mbk/src -L../../aut/src libVex_la_LIBADD = -lAut -lMut diff --git a/alliance/src/vpn/src/Makefile.am b/alliance/src/vpn/src/Makefile.am index c5687e90..5916f586 100644 --- a/alliance/src/vpn/src/Makefile.am +++ b/alliance/src/vpn/src/Makefile.am @@ -6,5 +6,5 @@ libVpn_la_SOURCES = vpnalloc.c vpnenv.h vpnget.c vpnsimp.h \ vpn.h vpndel.c vpnerror.h vpnsearch.c vpnunion.h \ vpnadd.c vpndel.h vpnfree.c vpnsearch.h vpnview.c \ vpnadd.h vpnenv.c vpnfree.h vpnsimp.c vpnview.h -libVpn_la_LDFLAGS = -version-info @VPN_DLL_VERSION@ +libVpn_la_LDFLAGS = -version-info @VPN_DLL_VERSION@ -L../../vex/src -L../../aut/src -L../../mbk/src libVpn_la_LIBADD = -lVex -lAut -lMut diff --git a/alliance/src/xgra/src/XSB_parse.c b/alliance/src/xgra/src/XSB_parse.c index baba3e79..b3185b67 100644 --- a/alliance/src/xgra/src/XSB_parse.c +++ b/alliance/src/xgra/src/XSB_parse.c @@ -43,7 +43,7 @@ | | \------------------------------------------------------------*/ -# include +# include # include # include # include "mut.h"