From b7d2196bf249375e23a814a0c3c6269ac9cb72c2 Mon Sep 17 00:00:00 2001
From: Ludovic Jacomme <alliance-cvs@asim.lip6.fr>
Date: Mon, 26 Jul 2004 19:10:22 +0000
Subject: [PATCH] - new Makefile.am for new Alliance install strategy/scripts

---
 alliance/src/asimut/src/Makefile.am      | 2 +-
 alliance/src/ftl/src/Makefile.am         | 2 +-
 alliance/src/pcbs/src/emulbs/Makefile.am | 2 +-
 alliance/src/pcbs/src/pcbs/Makefile.am   | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/alliance/src/asimut/src/Makefile.am b/alliance/src/asimut/src/Makefile.am
index 500e5329..7d0c2a38 100644
--- a/alliance/src/asimut/src/Makefile.am
+++ b/alliance/src/asimut/src/Makefile.am
@@ -24,7 +24,7 @@ libSch_la_LDFLAGS = -version-info @SCH_DLL_VERSION@
 bin_PROGRAMS = asimut
 
 asimut_LDADD = \
--L${top_builddir} libCst.la libSch.la -lMlu -lMal -lMcl -lMel -lMhl -lMgl -lMsl \
+-L. libCst.la libSch.la -lMlu -lMal -lMcl -lMel -lMhl -lMgl -lMsl \
       -lMvg -lMlo -lRcn -lBvl -lBhl -lBeh -lPpt -lPhl -lPat -lLog -lMut
 
 asimut_SOURCES = \
diff --git a/alliance/src/ftl/src/Makefile.am b/alliance/src/ftl/src/Makefile.am
index 537c6e53..7b7b6b64 100644
--- a/alliance/src/ftl/src/Makefile.am
+++ b/alliance/src/ftl/src/Makefile.am
@@ -9,6 +9,6 @@ libFtl_la_LDFLAGS = -version-info @FTL_DLL_VERSION@
 EXTRA_PROGRAMS = fsmtest
 
 
-fsmtest_LDADD = -L${top_buildir}/src -lFtl -lFks -lFvh -lFsm \
+fsmtest_LDADD = -L. -lFtl -lFks -lFvh -lFsm \
 	        -lBdd -lAbl -lAut -lMut
 fsmtest_SOURCES = main.c
diff --git a/alliance/src/pcbs/src/emulbs/Makefile.am b/alliance/src/pcbs/src/emulbs/Makefile.am
index 860b8b89..42315d33 100644
--- a/alliance/src/pcbs/src/emulbs/Makefile.am
+++ b/alliance/src/pcbs/src/emulbs/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = emulbs
 
 CLEANFILES          =  emul_y.c emul_y.h emul_l.c y.tab.h y.tab.c
 
-INCLUDES = -I$(top_builddir)/src/emulbs -I$(top_srcdir)/src/emulbs 
+INCLUDES = -I$(srcdir)/../emulbs 
 
 emulbs_LDADD = @ALLIANCE_LIBS@ \
      -lMpu \
diff --git a/alliance/src/pcbs/src/pcbs/Makefile.am b/alliance/src/pcbs/src/pcbs/Makefile.am
index 0e6eb918..6ce63f06 100644
--- a/alliance/src/pcbs/src/pcbs/Makefile.am
+++ b/alliance/src/pcbs/src/pcbs/Makefile.am
@@ -10,11 +10,10 @@ bin_PROGRAMS = pcbs
 
 CLEANFILES          =  emul_y.c emul_y.h pga_y.c pga_y.h pga_l.c emul_l.c y.tab.c y.tab.h
 
-INCLUDES = -I$(top_builddir)/src/pcbs -I$(top_srcdir)/src/bvl \
--I$(top_srcdir)/src/pcbs
+INCLUDES = -I$(srcdir)/../bvl -I$(srcdir)/../pcbs
 
 pcbs_LDADD = \
-	   -L$(top_builddir)/src/bvl -lBvl \
+	   -L../bvl -lBvl \
      @ALLIANCE_LIBS@ \
      -lMal \
      -lMap \