From a71aea1cf54fd7bb4dababa472deaf36a7829442 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 16 Oct 2002 18:11:04 +0000 Subject: [PATCH] * ./alliance.m4 : - Reorganisation de la facon dont les chemins d'acces aux librairies aux includes Alliance sont founis aux configure.in/Makefile.am. Jusqu'a present ils etaient fournis par l'intermediaires des variables ALLIANCE_CFLAGS et ALLIANCE_LIBS qui etaient ensuite substituees dans les Makefile.in par configure. De plus il fallait explicitement les ajouter dans AM_CFLAGS et _LDADD (Makefile.am). On avait donc le parcourt suivant : alliance.m4 : ALLIANCE_INCLUDE + AC_SUBST Makefile.am : AM_CFLAGS Maintenant, dans le alliance.m4, ALLIANCE_INCLUDE est ajoute a CFLAGS et ALLIANCE_LIB a LDFLAGS. De cette facon, tous les programmes auront ces chemins systematiquement positionnes par defaut (les @ALLIANCE_INCLUDE@ et @ALLIANCE_LIB@ disparaissent des Makefile.am) - Nouveaux switchs pour configure : --enable-devel et --enable-alc-shared. Comme ils sont ajoutes dans le alliance.m4, ils seront present automatiquement dans les configures des outils sans que les configure.in de ceux ci aie a etre modifies. - Utilisation des libraries locales de l'utilisateur : un nouveau switch a ete ajoute a configure (toujours avec une macro dans alliance.m4) : --enable-devel. Quant il est present, il intercale dans CFLAGS et LDFLAGS les chemins d'acces aux librairies developpees localement par l'utilisateur. Exemple typique : utiliser une version locale de MBK. - Activation des libraries dynamiques : switch --enable-alc-shared de configure. Si ce switch est present, le makefile tentera d'utiliser les versions dynamiques des librairies. Par defaut ce sont les versions statiques qui seront utilisees (comme auparavant). - Generation de librairies dynamiques : AC_PROG_LIBTOOL est inclu automatiquement par alliance.m4, il n'est donc pas necessaire de le remettre dans le configure.in des outils (mais ce ne genera pas). En revanche, il faut supprimmer la macro AC_PROG_RANLIB. * mbk/src/Makefile.am : - Passage en librairies dynamiques. * attila/src/attila.sh, attila/doc/man_attila.sgm : - Changement de syntaxe de la ligne de commande. On peut maintenant passer n'importe quels arguments a configure et a make par le biais de "-c-" et "-m". --- alliance/src/abe/src/Makefile.am | 9 ++------- alliance/src/abl/src/Makefile.am | 16 ++++++--------- alliance/src/abt/src/Makefile.am | 13 ++++--------- alliance/src/abv/src/Makefile.am | 13 ++++--------- alliance/src/asimut/src/Makefile.am | 16 +++++---------- alliance/src/aut/src/Makefile.am | 13 ++++--------- alliance/src/bdd/src/Makefile.am | 9 ++------- alliance/src/beh/src/Makefile.am | 9 ++------- alliance/src/bhl/src/Makefile.am | 9 ++------- alliance/src/btr/src/Makefile.am | 9 ++------- alliance/src/bvl/src/Makefile.am | 9 +++------ alliance/src/ctl/src/Makefile.am | 7 +------ alliance/src/ctp/src/Makefile.am | 14 ++++---------- alliance/src/druc/src/Makefile.am | 13 ++++--------- alliance/src/elp/src/Makefile.am | 12 +++--------- alliance/src/fks/src/Makefile.am | 9 ++------- alliance/src/fsm/src/Makefile.am | 9 ++------- alliance/src/ftl/src/Makefile.am | 13 ++++--------- alliance/src/fvh/src/Makefile.am | 11 +++-------- alliance/src/genlib/src/Makefile.am | 15 +++++--------- alliance/src/genpat/src/Makefile.am | 15 +++++--------- alliance/src/log/src/Makefile.am | 13 ++++--------- alliance/src/mbk/src/Makefile.am | 28 ++++++++++++++------------- alliance/src/mbkal/src/Makefile.am | 9 ++------- alliance/src/mbkap/src/Makefile.am | 9 ++------- alliance/src/mbkedif/src/Makefile.am | 8 +------- alliance/src/mbkhilo/src/Makefile.am | 10 ++-------- alliance/src/mbkmg/src/Makefile.am | 10 ++-------- alliance/src/mbkspice/src/Makefile.am | 10 ++-------- alliance/src/mbkvhdl/src/Makefile.am | 11 +++-------- alliance/src/mbkvhdlg/src/Makefile.am | 17 +++++----------- alliance/src/mbkvrlog/src/Makefile.am | 10 ++-------- alliance/src/mbkvti/src/Makefile.am | 11 +++-------- alliance/src/pat/src/Makefile.am | 10 ++-------- alliance/src/phl/src/Makefile.am | 13 +++---------- alliance/src/ppt/src/Makefile.am | 10 ++-------- alliance/src/rds/src/Makefile.am | 17 +++++++--------- alliance/src/rdscif/src/Makefile.am | 10 ++-------- alliance/src/rdsgds/src/Makefile.am | 10 ++-------- alliance/src/rtd/src/Makefile.am | 10 ++-------- alliance/src/rtn/src/Makefile.am | 10 ++-------- alliance/src/scl/src/Makefile.am | 10 ++-------- alliance/src/vbh/src/Makefile.am | 10 ++-------- alliance/src/vbl/src/Makefile.am | 10 ++-------- alliance/src/vex/src/Makefile.am | 10 ++-------- alliance/src/vpd/src/Makefile.am | 10 ++-------- alliance/src/vpn/src/Makefile.am | 10 ++-------- alliance/src/vtl/src/Makefile.am | 13 +++---------- alliance/src/vvh/src/Makefile.am | 10 ++-------- 49 files changed, 151 insertions(+), 411 deletions(-) diff --git a/alliance/src/abe/src/Makefile.am b/alliance/src/abe/src/Makefile.am index 7cb99cb0..dab73b38 100644 --- a/alliance/src/abe/src/Makefile.am +++ b/alliance/src/abe/src/Makefile.am @@ -1,13 +1,8 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libAbe_la_LDFLAGS = -version-info @ABE_DLL_VERSION@ diff --git a/alliance/src/abl/src/Makefile.am b/alliance/src/abl/src/Makefile.am index 8f3bd634..b4135adf 100644 --- a/alliance/src/abl/src/Makefile.am +++ b/alliance/src/abl/src/Makefile.am @@ -1,7 +1,8 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -lib_LTLIBRARIES = libAbl.la -include_HEADERS = abl.h -libAbl_la_SOURCES = abldel.h ablflat.h abloptim.h ablunflat.h \ +AM_CFLAGS = +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 \ @@ -12,9 +13,4 @@ ablctlsimp.c ablerror.c ablmap.c ablsubst.c \ ablctlsimp.h ablerror.h ablmap.h ablsubst.h \ abldel.c ablflat.c abloptim.c ablunflat.c - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libAbl_la_LDFLAGS = -version-info @ABL_DLL_VERSION@ diff --git a/alliance/src/abt/src/Makefile.am b/alliance/src/abt/src/Makefile.am index 36749082..e5513a81 100644 --- a/alliance/src/abt/src/Makefile.am +++ b/alliance/src/abt/src/Makefile.am @@ -1,14 +1,9 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -lib_LTLIBRARIES = libAbt.la +AM_CFLAGS = +lib_LTLIBRARIES = libAbt.la include_HEADERS = abt.h -libAbt_la_SOURCES = \ +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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libAbt_la_LDFLAGS = -version-info @ABT_DLL_VERSION@ diff --git a/alliance/src/abv/src/Makefile.am b/alliance/src/abv/src/Makefile.am index 076336bb..54bb046d 100644 --- a/alliance/src/abv/src/Makefile.am +++ b/alliance/src/abv/src/Makefile.am @@ -1,7 +1,7 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -lib_LTLIBRARIES = libAbv.la +AM_CFLAGS = +lib_LTLIBRARIES = libAbv.la include_HEADERS = abv.h -libAbv_la_SOURCES = bvl_bcomp_y.y bvl_bcomp_l.l \ +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 @@ -13,9 +13,4 @@ bvl_bcomp_y.c bvl_bcomp_y.h : $(srcdir)/bvl_bcomp_y.y 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libAbv_la_LDFLAGS = -version-info @ABV_DLL_VERSION@ diff --git a/alliance/src/asimut/src/Makefile.am b/alliance/src/asimut/src/Makefile.am index 1ad99069..90186b30 100644 --- a/alliance/src/asimut/src/Makefile.am +++ b/alliance/src/asimut/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libCst.la libSch.la include_HEADERS = cst.h sch.h @@ -18,9 +18,12 @@ 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@ + bin_PROGRAMS = asimut -asimut_LDADD = @ALLIANCE_LIBS@ \ +asimut_LDADD = \ -L. -lCst -lSch -lMlu -lMal -lMcl -lMel -lMhl -lMgl -lMsl -lMvg -lMlo -lRcn \ -lBvl -lBhl -lBeh -lPpt -lPhl -lPat -lLog -lMut @@ -31,12 +34,3 @@ 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 - - - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/aut/src/Makefile.am b/alliance/src/aut/src/Makefile.am index 85062a3e..0cd04349 100644 --- a/alliance/src/aut/src/Makefile.am +++ b/alliance/src/aut/src/Makefile.am @@ -1,16 +1,11 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -lib_LTLIBRARIES = libAut.la +AM_CFLAGS = +lib_LTLIBRARIES = libAut.la include_HEADERS = aut.h -libAut_la_SOURCES = autenv.h autfree.h authash2.h autsort.h \ +libAut_la_SOURCES = autenv.h autfree.h authash2.h autsort.h \ autalloc.c auterror.c autgraph.c autname.c auttest.c \ autalloc.h auterror.h autgraph.h autname.h auttest.h \ autdebug.c autexit.c authash.c autresize.c \ autdebug.h autexit.h authash.h autresize.h \ autenv.c autfree.c authash2.c autsort.c - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libAut_la_LDFLAGS = -version-info @AUT_DLL_VERSION@ diff --git a/alliance/src/bdd/src/Makefile.am b/alliance/src/bdd/src/Makefile.am index 0f7450d8..813e075b 100644 --- a/alliance/src/bdd/src/Makefile.am +++ b/alliance/src/bdd/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libBdd.la include_HEADERS = bdd.h libBdd_la_SOURCES = \ @@ -25,9 +25,4 @@ bdddump.c bddhoper.c bddsatisfy.c \ bdddump.h bddhoper.h bddsatisfy.h \ bddenv.c bddimply.c bddsimpdc.c - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libBdd_la_LDFLAGS = -version-info @BDD_DLL_VERSION@ diff --git a/alliance/src/beh/src/Makefile.am b/alliance/src/beh/src/Makefile.am index 40437088..1c394f0a 100644 --- a/alliance/src/beh/src/Makefile.am +++ b/alliance/src/beh/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libBeh.la include_HEADERS = beh.h libBeh_la_SOURCES = \ @@ -20,9 +20,4 @@ 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libBeh_la_LDFLAGS = -version-info @BEH_DLL_VERSION@ diff --git a/alliance/src/bhl/src/Makefile.am b/alliance/src/bhl/src/Makefile.am index 45e4e370..f3ffdbcb 100644 --- a/alliance/src/bhl/src/Makefile.am +++ b/alliance/src/bhl/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libBhl.la include_HEADERS = bhl.h libBhl_la_SOURCES = \ @@ -8,9 +8,4 @@ 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libBhl_la_LDFLAGS = -version-info @BHL_DLL_VERSION@ diff --git a/alliance/src/btr/src/Makefile.am b/alliance/src/btr/src/Makefile.am index 9b05d6c7..712940a0 100644 --- a/alliance/src/btr/src/Makefile.am +++ b/alliance/src/btr/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libBtr.la include_HEADERS = btr.h libBtr_la_SOURCES = \ @@ -6,9 +6,4 @@ 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libBtr_la_LDFLAGS = -version-info @BTR_DLL_VERSION@ diff --git a/alliance/src/bvl/src/Makefile.am b/alliance/src/bvl/src/Makefile.am index c077b5b7..95971869 100644 --- a/alliance/src/bvl/src/Makefile.am +++ b/alliance/src/bvl/src/Makefile.am @@ -1,18 +1,15 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libBvl.la include_HEADERS = bvl.h libBvl_la_SOURCES = bvl_bcomp_y.y bvl_bcomp_l.l \ 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@ + 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 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - diff --git a/alliance/src/ctl/src/Makefile.am b/alliance/src/ctl/src/Makefile.am index 1f3b00f0..afa8d0ae 100644 --- a/alliance/src/ctl/src/Makefile.am +++ b/alliance/src/ctl/src/Makefile.am @@ -6,9 +6,4 @@ 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libCtl_la_LDFLAGS = -version-info @CTL_DLL_VERSION@ diff --git a/alliance/src/ctp/src/Makefile.am b/alliance/src/ctp/src/Makefile.am index 1695a6aa..7bdd3202 100644 --- a/alliance/src/ctp/src/Makefile.am +++ b/alliance/src/ctp/src/Makefile.am @@ -1,10 +1,12 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = 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@ + CLEANFILES = ctp_y.c ctp_y.h ctp_l.c @@ -15,15 +17,7 @@ ctp_l.c : $(srcdir)/ctp_l.l ctp_y.h EXTRA_PROGRAMS = ctptest -ctptest_LDADD = @ALLIANCE_LIBS@ \ - $(top_builddir)/src/libCtp.la \ +ctptest_LDADD = -L$(top_builddir)/src -lCtp \ -lCtl -lVex -lAut -lMut ctptest_SOURCES = main.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am index 9d47cdf0..1ec0e78f 100644 --- a/alliance/src/druc/src/Makefile.am +++ b/alliance/src/druc/src/Makefile.am @@ -8,6 +8,8 @@ drucompi.h drucring.c drucring.h drucutil.c drucutil.h vmcaract.c vmcaract.h \ vmcasmld.c vmcasmld.h vmcerror.c vmcerror.h vmcmesur.c vmcmesur.h vmcrelat.c \ vmcrelat.h vmctools.c vmctools.h vmcunify.c vmcunify.h +libVrd_la_LDFLAGS = -version-info @VRD_DLL_VERSION@ + CLEANFILES = drucompi_l.c drucompi_y.h drucompi_y.c drucompi_y.c drucompi_y.h : $(srcdir)/drucompi_y.y @@ -18,18 +20,11 @@ drucompi_l.c : $(srcdir)/drucompi_l.l drucompi_y.h bin_PROGRAMS = druc -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = -druc_LDADD = @ALLIANCE_LIBS@ $(top_builddir)/src/libVrd.la \ +druc_LDADD = -L$(top_builddir)/src -lVrd \ -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu -lMcp -lMap -lMmg -lMph \ -lMut druc_SOURCES = \ drucbath.c drucbath.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/elp/src/Makefile.am b/alliance/src/elp/src/Makefile.am index 6f698b3e..cd22aed4 100644 --- a/alliance/src/elp/src/Makefile.am +++ b/alliance/src/elp/src/Makefile.am @@ -1,11 +1,12 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ \ - -DTECHNOLOGY=\"etc/prol.elp\" +AM_CFLAGS = -DTECHNOLOGY=\"etc/prol.elp\" 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@ + CLEANFILES = elp_y.c elp_y.h elp_l.c elp_y.c elp_y.h : $(srcdir)/elp_y.y @@ -13,10 +14,3 @@ elp_y.c elp_y.h : $(srcdir)/elp_y.y elp_l.c : $(srcdir)/elp_l.l elp_y.h $(LEX) -t $(srcdir)/elp_l.l | sed -e "s/yy/elpyy/g" -e "s/YY/elpYY/g" > elp_l.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/fks/src/Makefile.am b/alliance/src/fks/src/Makefile.am index c405c238..275d3c1c 100644 --- a/alliance/src/fks/src/Makefile.am +++ b/alliance/src/fks/src/Makefile.am @@ -1,12 +1,7 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libFks_la_LDFLAGS = -version-info @FKS_DLL_VERSION@ diff --git a/alliance/src/fsm/src/Makefile.am b/alliance/src/fsm/src/Makefile.am index eca11203..716f953d 100644 --- a/alliance/src/fsm/src/Makefile.am +++ b/alliance/src/fsm/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libFsm.la include_HEADERS = fsm.h libFsm_la_SOURCES = \ @@ -7,9 +7,4 @@ 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 - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libFsm_la_LDFLAGS = -version-info @FSM_DLL_VERSION@ diff --git a/alliance/src/ftl/src/Makefile.am b/alliance/src/ftl/src/Makefile.am index 975c1a34..537c6e53 100644 --- a/alliance/src/ftl/src/Makefile.am +++ b/alliance/src/ftl/src/Makefile.am @@ -1,19 +1,14 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = 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@ + EXTRA_PROGRAMS = fsmtest -fsmtest_LDADD = @ALLIANCE_LIBS@ -lFtl -lFks -lFvh -lFsm \ +fsmtest_LDADD = -L${top_buildir}/src -lFtl -lFks -lFvh -lFsm \ -lBdd -lAbl -lAut -lMut fsmtest_SOURCES = main.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/fvh/src/Makefile.am b/alliance/src/fvh/src/Makefile.am index 64d942e0..ebca4b8c 100644 --- a/alliance/src/fvh/src/Makefile.am +++ b/alliance/src/fvh/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libFvh.la include_HEADERS = fvh.h libFvh_la_SOURCES = fbl_bcomp_y.y fbl_bcomp_l.l \ @@ -9,16 +9,11 @@ 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@ + 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 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/genlib/src/Makefile.am b/alliance/src/genlib/src/Makefile.am index b3875ce2..c3d992fd 100644 --- a/alliance/src/genlib/src/Makefile.am +++ b/alliance/src/genlib/src/Makefile.am @@ -1,9 +1,9 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = AM_YFLAGS = AM_LFLAGS = -lib_LTLIBRARIES = libMgn.la +lib_LTLIBRARIES = libMgn.la include_HEADERS = mgn.h mbkgen.h genlib.h dgn.h -libMgn_la_SOURCES = genlib.c \ +libMgn_la_SOURCES = genlib.c \ debugon.h \ debugoff.h \ GNU_Defs.h \ @@ -25,6 +25,8 @@ libMgn_la_SOURCES = genlib.c \ dpgen_uROM.c \ dpgen_Shifter.c +libMgn_la_LDFLAGS = -version-info @MGN_DLL_VERSION@ + bin_SCRIPTS = genlib CLEANFILES = genlib y.output dpgen_ROM_code.c dpgen_ROM_code.h @@ -33,10 +35,3 @@ genlib : ${srcdir}/genlib.sh chmod a+x $@ EXTRA_DIST = genlib.sh dpgen_ROM_code.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/genpat/src/Makefile.am b/alliance/src/genpat/src/Makefile.am index 457a5937..e300514d 100644 --- a/alliance/src/genpat/src/Makefile.am +++ b/alliance/src/genpat/src/Makefile.am @@ -1,10 +1,12 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -lib_LTLIBRARIES = libPgn.la +AM_CFLAGS = +lib_LTLIBRARIES = libPgn.la include_HEADERS = genpat.h -libPgn_la_SOURCES = AFFECT.c ARRAY.c CONV.c DECLAR.c DEF_GEN.c GETCPAT.c \ +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@ + bin_SCRIPTS = genpat CLEANFILES = genpat @@ -13,10 +15,3 @@ genpat : ${srcdir}/genpat.sh chmod a+x $@ EXTRA_DIST = genpat.sh - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/log/src/Makefile.am b/alliance/src/log/src/Makefile.am index 4931977a..2eb890ff 100644 --- a/alliance/src/log/src/Makefile.am +++ b/alliance/src/log/src/Makefile.am @@ -1,13 +1,8 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -lib_LTLIBRARIES = libLog.la +AM_CFLAGS = +lib_LTLIBRARIES = libLog.la include_HEADERS = log.h -libLog_la_SOURCES = \ +libLog_la_SOURCES = \ log_bdd0.c log.h log_thashbdd.c log_thashloc.c \ log_bdd1.c log_prefbib.c log_thash.c - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libLog_la_LDFLAGS = -version-info @LOG_DLL_VERSION@ diff --git a/alliance/src/mbk/src/Makefile.am b/alliance/src/mbk/src/Makefile.am index bc62446c..1f0ae61b 100644 --- a/alliance/src/mbk/src/Makefile.am +++ b/alliance/src/mbk/src/Makefile.am @@ -1,16 +1,18 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ -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 -libMph_la_SOURCES = mbk_ph.c mbk_ph.h -libMpu_la_SOURCES = mbk_ph_util.c mbk_ph_util.h -libMlo_la_SOURCES = mbk_lo.c mbk_lo.h -libMlu_la_SOURCES = mbk_lo_util.c mbk_lo_util.h -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 +AM_CFLAGS = +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 -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - +libMph_la_SOURCES = mbk_ph.c mbk_ph.h +libMpu_la_SOURCES = mbk_ph_util.c mbk_ph_util.h +libMlo_la_SOURCES = mbk_lo.c mbk_lo.h +libMlu_la_SOURCES = mbk_lo_util.c mbk_lo_util.h +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 +libMph_la_LDFLAGS = -version-info @MBK_DLL_VERSION@ +libMpu_la_LDFLAGS = -version-info @MBK_DLL_VERSION@ +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@ diff --git a/alliance/src/mbkal/src/Makefile.am b/alliance/src/mbkal/src/Makefile.am index f5da7209..89d29f44 100644 --- a/alliance/src/mbkal/src/Makefile.am +++ b/alliance/src/mbkal/src/Makefile.am @@ -1,10 +1,5 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMal.la libMal_la_SOURCES = alc_driv_l.c alc_pars_l.c alc_pars_l6.c mal.h - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libMal_la_LDFLAGS = -version-info @MAL_DLL_VERSION@ diff --git a/alliance/src/mbkap/src/Makefile.am b/alliance/src/mbkap/src/Makefile.am index 5d8a6b6e..73b4e1e3 100644 --- a/alliance/src/mbkap/src/Makefile.am +++ b/alliance/src/mbkap/src/Makefile.am @@ -1,10 +1,5 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMap.la libMap_la_SOURCES = alc_driv_p.c alc_pars_p.c map.h - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libMap_la_LDFLAGS = -version-info @MAP_DLL_VERSION@ diff --git a/alliance/src/mbkedif/src/Makefile.am b/alliance/src/mbkedif/src/Makefile.am index 1cb11599..e1ae48c1 100644 --- a/alliance/src/mbkedif/src/Makefile.am +++ b/alliance/src/mbkedif/src/Makefile.am @@ -1,16 +1,10 @@ AM_CFLAGS = @ALLIANCE_CFLAGS@ lib_LTLIBRARIES = libMel.la libMel_la_SOURCES = time.c driver.c parser_y.y parser_l.l +libMel_la_LDFLAGS = -version-info @MEL_DLL_VERSION@ CLEANFILES = parser_y.c parser_y.h parser_l.c parser_y.c parser_y.h : $(srcdir)/parser_y.y $(YACC) -d $(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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/mbkhilo/src/Makefile.am b/alliance/src/mbkhilo/src/Makefile.am index 67e31131..f8f0a3ff 100644 --- a/alliance/src/mbkhilo/src/Makefile.am +++ b/alliance/src/mbkhilo/src/Makefile.am @@ -1,10 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMhl.la libMhl_la_SOURCES = drive_hilo.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libMhl_la_LDFLAGS = -version-info @MHL_DLL_VERSION@ diff --git a/alliance/src/mbkmg/src/Makefile.am b/alliance/src/mbkmg/src/Makefile.am index 6673430f..ed29c0b6 100644 --- a/alliance/src/mbkmg/src/Makefile.am +++ b/alliance/src/mbkmg/src/Makefile.am @@ -1,16 +1,10 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMmg.la libMmg_la_SOURCES = mbk2mg.c mg2mbk_y.y mg2mbk_l.l mmg.h +libMmg_la_LDFLAGS = -version-info @MMG_DLL_VERSION@ CLEANFILES = mg2mbk_y.c mg2mbk_y.h mg2mbk_l.c mg2mbk_y.c mg2mbk_y.h : $(srcdir)/mg2mbk_y.y $(YACC) -d $(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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/mbkspice/src/Makefile.am b/alliance/src/mbkspice/src/Makefile.am index d688e3cf..6bd2cc3c 100644 --- a/alliance/src/mbkspice/src/Makefile.am +++ b/alliance/src/mbkspice/src/Makefile.am @@ -1,14 +1,8 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMsl.la include_HEADERS = msl.h libMsl_la_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 \ spi_msg.h spi_parse.c spi_parse.h \ msl.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libMsl_la_LDFLAGS = -version-info @MSL_DLL_VERSION@ diff --git a/alliance/src/mbkvhdl/src/Makefile.am b/alliance/src/mbkvhdl/src/Makefile.am index b972858c..3cabc9d0 100644 --- a/alliance/src/mbkvhdl/src/Makefile.am +++ b/alliance/src/mbkvhdl/src/Makefile.am @@ -1,5 +1,5 @@ YFLAGS = -d -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMvl.la libMvl_la_SOURCES = mvl_drive.c mvl_parse.h mvl_sspec.c mvl_syacc.h mvl_utype.h \ @@ -7,16 +7,11 @@ mvl_drive.h mvl_scomp_l.l mvl_sspec.h mvl_utdef.h \ mvl.h mvl_scomp_y.y mvl_stdef.h mvl_util.c \ mvl_parse.c mvl_slex.h mvl_stype.h mvl_util.h +libMvl_la_LDFLAGS = -version-info @MVL_DLL_VERSION@ + CLEANFILES = mvl_scomp_y.c mvl_scomp_y.h mvl_scomp_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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/mbkvhdlg/src/Makefile.am b/alliance/src/mbkvhdlg/src/Makefile.am index e7942ba1..80451da8 100644 --- a/alliance/src/mbkvhdlg/src/Makefile.am +++ b/alliance/src/mbkvhdlg/src/Makefile.am @@ -1,5 +1,5 @@ YFLAGS = -d -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMvg.la libMvg_la_SOURCES = mvl_drive.c mvl_parse.c mvl_util.c mvl_sspec.c \ @@ -10,6 +10,8 @@ libMvg_la_SOURCES = mvl_drive.c mvl_parse.c mvl_util.c mvl_sspec.c \ 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 +libMvg_la_LDFLAGS = -version-info @MVG_DLL_VERSION@ + CLEANFILES = mvl_scomp_y.c mvl_scomp_y.h mvl_scomp_l.c mvl_scomp_y.c mvl_scomp_y.h : $(srcdir)/mvl_scomp_y.y @@ -19,23 +21,14 @@ mvl_scomp_l.c : $(srcdir)/mvl_scomp_l.l mvl_scomp_y.h bin_PROGRAMS = x2vy x2vy_SOURCES = x2vy_main.c -x2vy_LDADD = @ALLIANCE_LIBS@ \ - -lMlu \ +x2vy_LDADD = -lMlu \ -lMcl \ -lMel \ -lMhl \ -lMal \ -lMsl \ -lMgl \ - $(top_builddir)/src/libMvg.la \ + -L$(top_builddir)/src -lMvg \ -lMlo \ -lMut \ -lRcn - - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/mbkvrlog/src/Makefile.am b/alliance/src/mbkvrlog/src/Makefile.am index c65b0c0d..c143cc76 100644 --- a/alliance/src/mbkvrlog/src/Makefile.am +++ b/alliance/src/mbkvrlog/src/Makefile.am @@ -1,10 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libMgl.la libMgl_la_SOURCES = drive_vlog.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libMgl_la_LDFLAGS = -version-info @MGL_DLL_VERSION@ diff --git a/alliance/src/mbkvti/src/Makefile.am b/alliance/src/mbkvti/src/Makefile.am index e1231897..42de45a6 100644 --- a/alliance/src/mbkvti/src/Makefile.am +++ b/alliance/src/mbkvti/src/Makefile.am @@ -1,11 +1,6 @@ lib_LTLIBRARIES = libMcp.la libMcl.la -AM_CFLAGS = @ALLIANCE_CFLAGS@ -DTECHNO=\"symbolic_cmos\" +AM_CFLAGS = -DTECHNO=\"symbolic_cmos\" libMcp_la_SOURCES = drive_vti_p.c drive_vti_p.h parse_vti_p.c mcp.h libMcl_la_SOURCES = drive_vti_l.c drive_vti_l.h parse_vti_l.c mcl.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libMcp_la_LDFLAGS = -version-info @MCP_DLL_VERSION@ +libMcl_la_LDFLAGS = -version-info @MCL_DLL_VERSION@ diff --git a/alliance/src/pat/src/Makefile.am b/alliance/src/pat/src/Makefile.am index b06f86fa..4636e12f 100644 --- a/alliance/src/pat/src/Makefile.am +++ b/alliance/src/pat/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libPat.la include_HEADERS = pat.h libPat_la_SOURCES = \ @@ -7,10 +7,4 @@ pat_addpains.c pat_addpaiol.c pat_addpapat.c pat_addpaseq.c \ pat_crtpaiol.c pat_error.c pat_frepacom.c pat_frepaevt.c \ pat_frepaini.c pat_frepaiol.c pat_frepapat.c pat_globals.c \ pat.h pat_message.c pat_warning.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libPat_la_LDFLAGS = -version-info @PAT_DLL_VERSION@ diff --git a/alliance/src/phl/src/Makefile.am b/alliance/src/phl/src/Makefile.am index 84024892..454b2a06 100644 --- a/alliance/src/phl/src/Makefile.am +++ b/alliance/src/phl/src/Makefile.am @@ -1,12 +1,5 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libPhl.la include_HEADERS = phl.h -libPhl_la_SOURCES = \ -pat_debug.c pat_debug.h pat_getusage.c phl.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libPhl_la_SOURCES = pat_debug.c pat_debug.h pat_getusage.c phl.h +libPhl_la_LDFLAGS = -version-info @PHL_DLL_VERSION@ diff --git a/alliance/src/ppt/src/Makefile.am b/alliance/src/ppt/src/Makefile.am index 6ac3cea3..a09f50c8 100644 --- a/alliance/src/ppt/src/Makefile.am +++ b/alliance/src/ppt/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libPpt.la include_HEADERS = ppt.h @@ -7,6 +7,7 @@ pat_decl.h pat_defs.h \ pat_desc.h pat_drvpat.c \ pat_lodpaseq.c pat_pattostr.c pat_prspat.c pat_savpaseq.c \ pat_type.h ppt.h +libPpt_la_LDFLAGS = -version-info @PPT_DLL_VERSION@ CLEANFILES = pat_decl_y.c pat_decl_y.h pat_desc_y.h pat_desc_y.c \ pat_decl_l.c @@ -29,10 +30,3 @@ pat_desc_y.c pat_desc_y.h : $(srcdir)/pat_desc_y.y 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/rds/src/Makefile.am b/alliance/src/rds/src/Makefile.am index 8a6dfe45..176bbacf 100644 --- a/alliance/src/rds/src/Makefile.am +++ b/alliance/src/rds/src/Makefile.am @@ -4,8 +4,7 @@ lib_LTLIBRARIES = libRds.la \ libRpr.la \ libRwi.la \ libRtl.la -AM_CFLAGS = @ALLIANCE_CFLAGS@ \ - -DRTL_DEFAULT_TECHNO=\"etc/cmos.rds\" +AM_CFLAGS = -DRTL_DEFAULT_TECHNO=\"etc/cmos.rds\" include_HEADERS = rds.h rfm.h rtl.h rwi.h rpr.h rut.h libRds_la_SOURCES = rdsalloc.c rdsfree.c rdsadd.c rdsdel.c rdsview.c \ @@ -24,11 +23,9 @@ libRwi_la_SOURCES = rwialloc.c rwidel.c rwierror.c rwiget.c rwiadd.c \ rwibuild.h rwidestroy.h rwifree.h rwiview.h libRtl_la_SOURCES = rtlacces.c rtlenv.c rtlerror.c \ rtlacces.h rtlenv.h rtlerror.h - - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libRds_la_LDFLAGS = -version-info @RDS_DLL_VERSION@ +libRut_la_LDFLAGS = -version-info @RUT_DLL_VERSION@ +libRfm_la_LDFLAGS = -version-info @RFM_DLL_VERSION@ +libRpr_la_LDFLAGS = -version-info @RPR_DLL_VERSION@ +libRwi_la_LDFLAGS = -version-info @RWI_DLL_VERSION@ +libRtl_la_LDFLAGS = -version-info @RTL_DLL_VERSION@ diff --git a/alliance/src/rdscif/src/Makefile.am b/alliance/src/rdscif/src/Makefile.am index c2595da8..57f579ad 100644 --- a/alliance/src/rdscif/src/Makefile.am +++ b/alliance/src/rdscif/src/Makefile.am @@ -1,11 +1,5 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libRcf.la libRcf_la_SOURCES = cif_drive.c cif_error.c cif_parse.c rcf.h cif.h cif_drive.h cif_error.h cif_parse.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libRcf_la_LDFLAGS = -version-info @RCF_DLL_VERSION@ diff --git a/alliance/src/rdsgds/src/Makefile.am b/alliance/src/rdsgds/src/Makefile.am index 822ddd70..b0ff651e 100644 --- a/alliance/src/rdsgds/src/Makefile.am +++ b/alliance/src/rdsgds/src/Makefile.am @@ -1,10 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libRgs.la libRgs_la_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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libRgs_la_LDFLAGS = -version-info @RGS_DLL_VERSION@ diff --git a/alliance/src/rtd/src/Makefile.am b/alliance/src/rtd/src/Makefile.am index 75b0bafc..4b8589d2 100644 --- a/alliance/src/rtd/src/Makefile.am +++ b/alliance/src/rtd/src/Makefile.am @@ -1,13 +1,7 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libRtd_la_LDFLAGS = -version-info @RTD_DLL_VERSION@ diff --git a/alliance/src/rtn/src/Makefile.am b/alliance/src/rtn/src/Makefile.am index ad8139d3..b00be0b2 100644 --- a/alliance/src/rtn/src/Makefile.am +++ b/alliance/src/rtn/src/Makefile.am @@ -1,14 +1,8 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libRtn.la 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libRtn_la_LDFLAGS = -version-info @RTN_DLL_VERSION@ diff --git a/alliance/src/scl/src/Makefile.am b/alliance/src/scl/src/Makefile.am index 4018ccad..b56bcb36 100644 --- a/alliance/src/scl/src/Makefile.am +++ b/alliance/src/scl/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libScl.la include_HEADERS = scl.h libScl_la_SOURCES = \ @@ -9,10 +9,4 @@ scgbefig.h schalloc.c scherror.h scpbuild.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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libScl_la_LDFLAGS = -version-info @SCL_DLL_VERSION@ diff --git a/alliance/src/vbh/src/Makefile.am b/alliance/src/vbh/src/Makefile.am index e222ecd7..39ef04e1 100644 --- a/alliance/src/vbh/src/Makefile.am +++ b/alliance/src/vbh/src/Makefile.am @@ -1,12 +1,6 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVbh.la include_HEADERS = vbh.h libVbh_la_SOURCES = \ vbh.h vbh_add.c vbh_crt.c vbh_dup.c vbh_fre.c vbh_simp.c vbh_view.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libVbh_la_LDFLAGS = -version-info @VBH_DLL_VERSION@ diff --git a/alliance/src/vbl/src/Makefile.am b/alliance/src/vbl/src/Makefile.am index 0b8d51a9..3b718135 100644 --- a/alliance/src/vbl/src/Makefile.am +++ b/alliance/src/vbl/src/Makefile.am @@ -1,9 +1,10 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVbl.la include_HEADERS = vbl.h libVbl_la_SOURCES = vbl_bcomp_y.y vbl_bcomp_l.l \ vbl_bedef.h vbl_bspec.c vbl_byacc.h vbl_util.c vbl_utype.h \ vbl.h vbl_blex.h vbl_bspec.h vbl_parse.c vbl_util.h +libVbl_la_LDFLAGS = -version-info @VBL_DLL_VERSION@ CLEANFILES = vbl_bcomp_y.c vbl_bcomp_y.h vbl_bcomp_l.c @@ -11,10 +12,3 @@ 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 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - diff --git a/alliance/src/vex/src/Makefile.am b/alliance/src/vex/src/Makefile.am index f4a93b9f..d96bb0be 100644 --- a/alliance/src/vex/src/Makefile.am +++ b/alliance/src/vex/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVex.la include_HEADERS = vex.h libVex_la_SOURCES = \ @@ -9,10 +9,4 @@ vexadd.h vexdup.c vexeval.h vexis.c vexsimp.h \ 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libVex_la_LDFLAGS = -version-info @VEX_DLL_VERSION@ diff --git a/alliance/src/vpd/src/Makefile.am b/alliance/src/vpd/src/Makefile.am index 6907f9a7..c251d45f 100644 --- a/alliance/src/vpd/src/Makefile.am +++ b/alliance/src/vpd/src/Makefile.am @@ -1,13 +1,7 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVpd.la include_HEADERS = vpd.h libVpd_la_SOURCES = \ vpd.h vpd_drive.h vpd_error.h vpd_parse.h \ vpd_drive.c vpd_error.c vpd_parse.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libVpd_la_LDFLAGS = -version-info @VPD_DLL_VERSION@ diff --git a/alliance/src/vpn/src/Makefile.am b/alliance/src/vpn/src/Makefile.am index 8ab589e1..de0bcf87 100644 --- a/alliance/src/vpn/src/Makefile.am +++ b/alliance/src/vpn/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVpn.la include_HEADERS = vpn.h libVpn_la_SOURCES = \ @@ -7,10 +7,4 @@ vpnalloc.h vpnerror.c vpnget.h vpnunion.c \ 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 - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libVpn_la_LDFLAGS = -version-info @VPN_DLL_VERSION@ diff --git a/alliance/src/vtl/src/Makefile.am b/alliance/src/vtl/src/Makefile.am index a5723720..c290e830 100644 --- a/alliance/src/vtl/src/Makefile.am +++ b/alliance/src/vtl/src/Makefile.am @@ -1,12 +1,5 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVtl.la include_HEADERS = vtl.h -libVtl_la_SOURCES = \ -vtl.h vtlacces.c vtlacces.h vtlerror.c vtlerror.h - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libVtl_la_SOURCES = vtl.h vtlacces.c vtlacces.h vtlerror.c vtlerror.h +libVtl_la_LDFLAGS = -version-info @VTL_DLL_VERSION@ diff --git a/alliance/src/vvh/src/Makefile.am b/alliance/src/vvh/src/Makefile.am index 0c4231e2..a10095c6 100644 --- a/alliance/src/vvh/src/Makefile.am +++ b/alliance/src/vvh/src/Makefile.am @@ -1,13 +1,7 @@ -AM_CFLAGS = @ALLIANCE_CFLAGS@ +AM_CFLAGS = lib_LTLIBRARIES = libVvh.la include_HEADERS = vvh.h libVvh_la_SOURCES = \ vvh.h vvh_drive.h vvh_error.h vvh_parse.h vvh_vbh2vpn.h \ vvh_drive.c vvh_error.c vvh_parse.c vvh_vbh2vpn.c - - -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - - +libVvh_la_LDFLAGS = -version-info @VVH_DLL_VERSION@