This is necessary to be able to use libmflash & libmtcr from external programs.
This also installs the needed libreg_access.a and libtools_layouts.a. Signed-off-by: Sébastien Dugué <[email protected]> --- mflash/Makefile.am | 8 +++++++- mstflint.spec.in | 4 ++-- mtcr_ul/Makefile.am | 5 +++-- reg_access/Makefile.am | 3 ++- tools_layouts/Makefile.am | 4 +++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mflash/Makefile.am b/mflash/Makefile.am index 632539c..68099e3 100644 --- a/mflash/Makefile.am +++ b/mflash/Makefile.am @@ -35,8 +35,14 @@ INCLUDES= -I. -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -I$(top_src AM_CFLAGS = -MD -pipe -Wall -W -DMST_UL -g ${MFLASH_INBAND_FLAG} -noinst_LIBRARIES = libmflash.a + +libmflash_adir = $(libdir)/mstflint +libmflash_a_LIBRARIES = libmflash.a libmflash_a_SOURCES = mflash.c mflash.h\ mflash_pack_layer.c mflash_pack_layer.h mflash_access_layer.c mflash_access_layer.h\ mflash_types.h mflash_common_structs.h + +libraryincludedir=$(includedir)/mstflint +libraryinclude_HEADERS = mflash.h mflash_types.h mflash_common_structs.h \ + $(top_srcdir)/common/compatibility.h diff --git a/mstflint.spec.in b/mstflint.spec.in index 0d9281b..966224c 100644 --- a/mstflint.spec.in +++ b/mstflint.spec.in @@ -78,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mstmcra %{_bindir}/mstconfig %{_bindir}/hca_self_test.ofed -%{_includedir}/mtcr_ul/mtcr.h -%{_libdir}/libmtcr_ul.a +%{_includedir}/mstflint +%{_libdir}/mstflint/* %{_datadir}/mstflint %{_mandir}/man1/* diff --git a/mtcr_ul/Makefile.am b/mtcr_ul/Makefile.am index dd1b68d..59fc6c5 100644 --- a/mtcr_ul/Makefile.am +++ b/mtcr_ul/Makefile.am @@ -33,7 +33,8 @@ # Makefile.am -- Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -lib_LIBRARIES = libmtcr_ul.a +libmtcr_ul_adir = $(libdir)/mstflint +libmtcr_ul_a_LIBRARIES = libmtcr_ul.a libmtcr_ul_a_SOURCES = mtcr_ul.c mtcr_ib.h mtcr_int_defs.h\ mtcr_tools_cif.c mtcr_tools_cif.h\ @@ -48,6 +49,6 @@ else libmtcr_ul_a_CFLAGS += -DNO_INBAND endif -libraryincludedir=$(includedir)/mtcr_ul +libraryincludedir=$(includedir)/mstflint libraryinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am index 7f78060..99a83af 100644 --- a/reg_access/Makefile.am +++ b/reg_access/Makefile.am @@ -40,7 +40,8 @@ INCLUDES = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/ AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC) -noinst_LIBRARIES = libreg_access.a +libreg_access_adir = $(libdir)/mstflint +libreg_access_a_LIBRARIES = libreg_access.a libreg_access_a_SOURCES = reg_access.c reg_access.h libreg_access_a_DEPENDENCIES = $(USER_DIR)/tools_layouts/libtools_layouts.a diff --git a/tools_layouts/Makefile.am b/tools_layouts/Makefile.am index 17bdf6c..8880907 100644 --- a/tools_layouts/Makefile.am +++ b/tools_layouts/Makefile.am @@ -33,7 +33,9 @@ # Makefile.am -- Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/mtcr_ul -I$(top_srcdir)/common AM_CFLAGS = -Wall -W -g -MP -MD -pipe $(COMPILER_FPIC) -noinst_LIBRARIES = libtools_layouts.a + +libtools_layouts_adir = $(libdir)/mstflint +libtools_layouts_a_LIBRARIES = libtools_layouts.a libtools_layouts_a_SOURCES = cibfw_layouts.c adb_to_c_utils.c adb_to_c_utils.h cibfw_layouts.h \ register_access_open_layouts.h register_access_open_layouts.c \ -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
