[ofa-general] [PATCH 5/6] ibutils: Allow parallel build

[sebastien dugue]

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
---
 ibdm/src/Makefile.am     |    4 ++--
 ibmgtsim/src/Makefile.am |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ibdm/src/Makefile.am b/ibdm/src/Makefile.am
index b763387..682fb80 100644
--- a/ibdm/src/Makefile.am
+++ b/ibdm/src/Makefile.am
@@ -42,7 +42,7 @@ pkginclude_HEADERS = ibsysapi.h
 AM_CPPFLAGS = -I$(top_srcdir)/ibdm
 
 bin_PROGRAMS = ibdmchk ibdmtr ibtopodiff ibnlparse
-LDADD = -L../ibdm -libdmcom
+LDADD = -L../ibdm -libdmcom -L../replace -lreplace
 AM_LDFLAGS = -static
 
 # Why do we need to provide extra dep? the LDADD should have worked isnt it?
@@ -61,7 +61,7 @@ ibnlparse_SOURCES = test_ibnl_parser.cpp
 lib_LTLIBRARIES = libibsysapi.la
 libibsysapi_la_SOURCES = ibsysapi.cpp
 libibsysapi_la_LDFLAGS = -version-info 1:0:0
-libibsysapi_la_LIBADD = -L../ibdm -libdmcom
+libibsysapi_la_LIBADD = -L../ibdm -libdmcom -L../replace -lreplace
 
 #regexp_test_SOURCES = regexp_test.cpp
 
diff --git a/ibmgtsim/src/Makefile.am b/ibmgtsim/src/Makefile.am
index f23f2d8..f379a2a 100644
--- a/ibmgtsim/src/Makefile.am
+++ b/ibmgtsim/src/Makefile.am
@@ -55,7 +55,7 @@ bin_PROGRAMS = ibmssh ibmsquit #ibmgtsim test_msgmgr test_client test_server ibm
 if IBDM_REF_IS_USED
 # we assume we are building a parallel tree
 IBDM_PREFIX=$prefix
-IBDM_LIB=-L../../ibdm/ibdm -libdmcom
+IBDM_LIB=-L../../ibdm/ibdm -libdmcom -L../../ibdm/replace -lreplace
 IBDM_INC=-I$(srcdir)/../../ibdm/ibdm
 IBDM_IFC=$(srcdir)/../../ibdm/ibdm/ibdm.i
 else
@@ -83,6 +83,8 @@ ibmssh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib \
 
 ibmssh_LDADD = -libmscli $(IBDM_LIB) $(TCL_LIBS) -lpthread
 
+ibmssh_DEPENDENCIES = libibmscli.la
+
 # SWIG FILES:
 SWIG_IFC_FILES= $(srcdir)/sim.i $(srcdir)/ib_types.i $(IBDM_IFC) \
    $(srcdir)/inttypes.i $(srcdir)/mads.i
-- 
1.6.3.1