Construct the path to extra libraries from builddir and not top_builddir.

Merge the patch from Naohiko Shimizu <nshimizu@ip-arch.jp> for better
compatibility with pharosc (Graham Petley).
This commit is contained in:
Jean-Paul Chaput 2012-05-02 14:46:44 +00:00
parent 526b2a6a68
commit 6280a6a00a
2 changed files with 19 additions and 19 deletions

View File

@ -11,23 +11,23 @@ AM_CFLAGS = -I$(top_srcdir)/abe/src \
bin_PROGRAMS = boog
boog_LDADD = @ALLIANCE_LIBS@ \
-L$(top_builddir)/abv/src \
-L$(top_builddir)/abe/src \
-L$(top_builddir)/abt/src \
-L$(top_builddir)/mbk/src \
-L$(top_builddir)/mbkvti/src \
-L$(top_builddir)/mbkal/src \
-L$(top_builddir)/mbkspice/src \
-L$(top_builddir)/mbkhilo/src \
-L$(top_builddir)/mbkedif/src \
-L$(top_builddir)/mbkvhdlg/src \
-L$(top_builddir)/mbkvrlog/src \
-L$(top_builddir)/mbk/src \
-L$(top_builddir)/mbk/src \
-L$(top_builddir)/bdd/src \
-L$(top_builddir)/abl/src \
-L$(top_builddir)/aut/src \
-L$(top_builddir)/mbk/src \
-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_SOURCES = \

View File

@ -150,7 +150,7 @@ static int distribCell(befig_list* befig)
}
/*patterns aren't equal, new is more precise*/
if (!biabl_befig) break;
if (!biabl_befig) continue;
/*patterns are equal -->comparison*/
if (cell->AREA<getgenericarea(befig)) return 0; /*don't use the new*/
@ -224,7 +224,7 @@ static int distribCell(befig_list* befig)
}
/*patterns aren't equal, new is more precise*/
if (!biabl_befig) break;
if (biabl_befig) continue;
/*patterns are equal -->comparison*/
if (cell->AREA<getgenericarea(befig)) return 0; /*don't use the new*/