1 --- dapl-2.1.3/Makefile.am.orig 2014-11-21 17:55:46.000000000 +0100
2 +++ dapl-2.1.3/Makefile.am 2015-02-16 19:21:59.001701607 +0100
5 sysconf_DATA = doc/dat.conf
9 dapllibofadir = $(libdir)
12 dapllibomcmdir = $(libdir)
15 -datlib_LTLIBRARIES = dat/udat/libdat2.la
16 +lib_LTLIBRARIES = dat/udat/libdat2.la
18 dapllibofa_LTLIBRARIES = dapl/udapl/libdaplofa.la
21 dat/common/dat_init.c \
24 -dat_udat_libdat2_la_LDFLAGS = -version-info 2:0:0 $(dat_version_script) -ldl
25 +dat_udat_libdat2_la_LDFLAGS = -version-info 2:0:0 $(dat_version_script)
26 +dat_udat_libdat2_la_LIBADD = -ldl
31 dapl/openib_cma/device.c $(XPROGRAMS)
33 dapl_udapl_libdaplofa_la_LDFLAGS = -version-info 2:0:0 $(daplofa_version_script) \
34 - -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
35 - -lpthread -libverbs -lrdmacm $(XLIBS)
36 + -Wl,-init,dapl_init -Wl,-fini,dapl_fini
37 +dapl_udapl_libdaplofa_la_LIBADD = dat/udat/libdat2.la -lpthread -libverbs -lrdmacm $(XLIBS)
42 dapl/openib_scm/device.c $(XPROGRAMS)
44 dapl_udapl_libdaploscm_la_LDFLAGS = -version-info 2:0:0 $(daploscm_version_script) \
45 - -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
46 - -lpthread -libverbs $(XLIBS)
47 + -Wl,-init,dapl_init -Wl,-fini,dapl_fini
48 +dapl_udapl_libdaploscm_la_LIBADD = dat/udat/libdat2.la -lpthread -libverbs -lrdmacm $(XLIBS)
53 dapl/openib_ucm/device.c $(XPROGRAMS)
55 dapl_udapl_libdaploucm_la_LDFLAGS = -version-info 2:0:0 $(daploucm_version_script) \
56 - -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
57 - -lpthread -libverbs $(XLIBS)
58 + -Wl,-init,dapl_init -Wl,-fini,dapl_fini
59 +dapl_udapl_libdaploucm_la_LIBADD = dat/udat/libdat2.la -lpthread -libverbs -lrdmacm $(XLIBS)
64 dapl/openib_mcm/device.c $(XPROGRAMS)
66 dapl_udapl_libdaplomcm_la_LDFLAGS = -version-info 2:0:0 $(daplomcm_version_script) \
67 - -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
68 - -lpthread -libverbs -lscif $(XLIBS)
69 + -Wl,-init,dapl_init -Wl,-fini,dapl_fini
70 +dapl_udapl_libdaplomcm_la_LIBADD = dat/udat/libdat2.la -lpthread -libverbs -lscif $(XLIBS)
73 libdatincludedir = $(includedir)/dat2