projects / packages / dapl.git / blame
| Commit | Line | Data |
|---|---|---|
| 49e49ef7 JB |
1 | --- dapl-2.0.33/Makefile.am.orig 2011-08-19 21:50:55.000000000 +0200 |
| 2 | +++ dapl-2.0.33/Makefile.am 2011-09-11 07:42:56.516651249 +0200 | |
| 3 | @@ -80,6 +80,7 @@ | |
| 4 | -I$(srcdir)/dapl/openib_common \ | |
| 5 | -I$(srcdir)/dapl/openib_cma \ | |
| 6 | -I$(srcdir)/dapl/openib_cma/linux | |
| 7 | +dapl_udapl_libdaplofa_la_LIBADD = dat/udat/libdat2.la | |
| 8 | endif | |
| 9 | if DEFINE_SCM | |
| 10 | dapl_udapl_libdaploscm_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \ | |
| 11 | @@ -89,6 +90,7 @@ | |
| 12 | -I$(srcdir)/dapl/openib_common \ | |
| 13 | -I$(srcdir)/dapl/openib_scm \ | |
| 14 | -I$(srcdir)/dapl/openib_scm/linux | |
| 15 | +dapl_udapl_libdaploscm_la_LIBADD = dat/udat/libdat2.la | |
| 16 | endif | |
| 17 | if DEFINE_UCM | |
| 18 | dapl_udapl_libdaploucm_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \ | |
| 19 | @@ -98,6 +100,7 @@ | |
| 20 | -I$(srcdir)/dapl/openib_common \ | |
| 21 | -I$(srcdir)/dapl/openib_ucm \ | |
| 22 | -I$(srcdir)/dapl/openib_ucm/linux | |
| 23 | +dapl_udapl_libdaploucm_la_LIBADD = dat/udat/libdat2.la | |
| 24 | endif | |
| 25 | if HAVE_LD_VERSION_SCRIPT | |
| 26 | dat_version_script = -Wl,--version-script=$(srcdir)/dat/udat/libdat2.map | |
| 2bcfd8ca JB |
27 | --- dapl-2.0.35/Makefile.am.orig 2012-06-04 18:20:09.059860993 +0200 |
| 28 | +++ dapl-2.0.35/Makefile.am 2012-06-04 18:56:24.686436358 +0200 | |
| 29 | @@ -52,7 +52,6 @@ | |
| 30 | ||
| 31 | sysconf_DATA = doc/dat.conf | |
| 32 | ||
| 33 | -datlibdir = $(libdir) | |
| 34 | if DEFINE_CMA | |
| 35 | dapllibofadir = $(libdir) | |
| 36 | endif | |
| 37 | @@ -63,7 +62,7 @@ | |
| 38 | daplliboucmdir = $(libdir) | |
| 39 | endif | |
| 40 | ||
| 41 | -datlib_LTLIBRARIES = dat/udat/libdat2.la | |
| 42 | +lib_LTLIBRARIES = dat/udat/libdat2.la | |
| 43 | if DEFINE_CMA | |
| 44 | dapllibofa_LTLIBRARIES = dapl/udapl/libdaplofa.la | |
| 45 | endif |