From 365dd36d3157074071b057da23abcd91f242742d Mon Sep 17 00:00:00 2001 From: Oren Kladnitsky Date: Tue, 24 Dec 2013 14:29:24 +0200 Subject: [PATCH] Fixed build issues with 3.5.0 porting - Fixed all makefiles - The build mistakenly took mtcr.h from MFT installation instead of local version - Fixed bad MTCR_UL indication macro - Fixed mstregdump db files path selection - Updated tools_version - Added libmtcr_ul.a installation to spec - Compilation Warning fixes --- cmdparser/Makefile.am | 10 +++++----- common/tools_version.h | 2 +- dev_mgt/Makefile.am | 6 +++--- flint/Makefile.am | 24 ++++++++++++------------ include/mtcr_ul/mtcr.h | 4 ++-- mflash/Makefile.am | 19 ++++++++----------- mflash/mflash.c | 13 +++++++------ mflash/mflash_common.c | 11 ++++++----- mflash/mflash_common.h | 12 ++++++------ mlxfwops/lib/Makefile.am | 33 ++++++++++++++------------------- mstdump/crd_lib/Makefile.am | 19 ++++--------------- mstdump/crd_lib/crdump.c | 8 +++++--- mstdump/crd_main/Makefile.am | 14 +++++--------- mstdump/mstdump_dbs/Makefile.am | 6 ++---- mstflint.spec.in | 3 +++ mtcr_ul/Makefile.am | 3 +-- small_utils/Makefile.am | 21 +++++++++------------ tools_layouts/Makefile.am | 16 ++++------------ 18 files changed, 97 insertions(+), 127 deletions(-) diff --git a/cmdparser/Makefile.am b/cmdparser/Makefile.am index cd0ea98..9696f71 100644 --- a/cmdparser/Makefile.am +++ b/cmdparser/Makefile.am @@ -32,11 +32,11 @@ # Makefile.am -- Process this file with automake to produce Makefile.in -INCLUDES = - +INCLUDES = + AM_CPPFLAGS = -W -g -MP -MD -fPIC -lib_LTLIBRARIES = libcmdparser.la +noinst_LIBRARIES = libcmdparser.a + +libcmdparser_a_SOURCES = cmdparser.cpp my_getopt.c cmdparser.h my_getopt.h -libcmdparser_la_SOURCES = cmdparser.cpp my_getopt.c cmdparser.h my_getopt.h - diff --git a/common/tools_version.h b/common/tools_version.h index a3c526b..8b9f4b0 100644 --- a/common/tools_version.h +++ b/common/tools_version.h @@ -49,7 +49,7 @@ #endif #ifndef MFT_VERSION_STR - #define MFT_VERSION_STR "mft 3.0.0" + #define MFT_VERSION_STR "mft 3.5.0" #endif static inline diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am index f5c4b17..a2bc318 100644 --- a/dev_mgt/Makefile.am +++ b/dev_mgt/Makefile.am @@ -32,12 +32,12 @@ # Makefile.am -- Process this file with automake to produce Makefile.in -INCLUDES = -I. -I../common -I../include/mtcr_ul +INCLUDES = -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/include/mtcr_ul AM_CFLAGS = -W -Wall -g -MP -MD -Wswitch-enum $(COMPILER_FPIC) -DMTCR_EXPORT -noinst_LTLIBRARIES = libdev_mgt.la +noinst_LIBRARIES = libdev_mgt.a -libdev_mgt_la_SOURCES = \ +libdev_mgt_a_SOURCES = \ tools_dev_types.c \ tools_dev_types.h \ ../common/bit_slice.h \ diff --git a/flint/Makefile.am b/flint/Makefile.am index 00a60ad..3f3d035 100755 --- a/flint/Makefile.am +++ b/flint/Makefile.am @@ -31,24 +31,24 @@ #-- # Makefile.am -- Process this file with automake to produce Makefile.in -USER_DIR = .. -MTCR_DIR = $(USER_DIR)/mtcr_ul -COMMON_DIR = $(USER_DIR)/common -LAYOUTS_DIR = $(USER_DIR)/tools_layouts -LAYOUTS_LIB = $(LAYOUTS_DIR)/libtools_layouts.la +MTCR_DIR = $(top_srcdir)/mtcr_ul +MFLASH_DIR = $(top_srcdir)/mflash +COMMON_DIR = $(top_srcdir)/common +LAYOUTS_DIR = $(top_srcdir)/tools_layouts - - -INCLUDES = -I. -I.. -I$(MTCR_DIR) -I../mflash -I$(COMMON_DIR) \ +INCLUDES = -I$(srcdir) -I$(MTCR_DIR) -I$(MFLASH_DIR) -I$(COMMON_DIR) \ -I $(LAYOUTS_DIR) $(ZLIB_INC) -I$(MFT_EXT_LIBS_INC_DIR)/zlib -AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe +AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe bin_PROGRAMS = mstflint mstflint_SOURCES = flint.cpp flint.h subcommands.cpp subcommands.h\ flint_params.cpp flint_params.h cmd_line_parser.cpp err_msgs.h -mstflint_LDADD = ../mlxfwops/lib/libmlxfwops.la ../cmdparser/libcmdparser.la ../mflash/libmflash.la $(MTCR_DIR)/libmtcr_ul.a $(ZLIB_LIB) $(LAYOUTS_LIB) $(LIBSTD_CPP) -ldl +mstflint_LDADD = ../mlxfwops/lib/libmlxfwops.a \ + ../cmdparser/libcmdparser.a \ + ../mflash/libmflash.a \ + ../mtcr_ul/libmtcr_ul.a \ + ../tools_layouts/libtools_layouts.a \ + $(ZLIB_LIB) $(LAYOUTS_LIB) $(LIBSTD_CPP) -ldl -mstflintinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h -mstflintincludedir = @includedir@/mtcr_ul diff --git a/include/mtcr_ul/mtcr.h b/include/mtcr_ul/mtcr.h index fdfae79..b68464d 100644 --- a/include/mtcr_ul/mtcr.h +++ b/include/mtcr_ul/mtcr.h @@ -35,8 +35,8 @@ * SOFTWARE. */ -#ifndef _MTCR_UL_ -#define _MTCR_UL_ +#ifndef MTCR_H +#define MTCR_H #ifdef __cplusplus diff --git a/mflash/Makefile.am b/mflash/Makefile.am index 645c2c6..86043ed 100644 --- a/mflash/Makefile.am +++ b/mflash/Makefile.am @@ -31,17 +31,14 @@ #-- # Makefile.am -- Process this file with automake to produce Makefile.in -USER_DIR = .. -MTCR_DIR = $(USER_DIR)/mtcr_ul -INCLUDES = -I. -I$(MTCR_DIR) -I$(USER_DIR)/common -I$(USER_DIR)/tools_layouts +INCLUDES= -I. -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -I$(top_srcdir)/tools_layouts -AM_CFLAGS = -MD -pipe -Wall -W -D_MTCR_UL_ -g ${MFLASH_INBAND_FLAG} +AM_CFLAGS = -MD -pipe -Wall -W -DMST_UL -g ${MFLASH_INBAND_FLAG} +noinst_LIBRARIES = libmflash.a -lib_LTLIBRARIES = libmflash.la -# -libmflash_la_SOURCES = mflash.c mflash.h\ - mflash_inband.c mflash_inband.h\ - packets_common.c packets_common.h\ - internal_packets.c internal_packets.h internal_packets_types.h\ - mflash_common.c mflash_common.h mflash_access_layer.c mflash_access_layer.h +libmflash_a_SOURCES = mflash.c mflash.h\ + mflash_inband.c mflash_inband.h\ + packets_common.c packets_common.h\ + internal_packets.c internal_packets.h internal_packets_types.h\ + mflash_common.c mflash_common.h mflash_access_layer.c mflash_access_layer.h diff --git a/mflash/mflash.c b/mflash/mflash.c index 933c437..9d10bc5 100644 --- a/mflash/mflash.c +++ b/mflash/mflash.c @@ -46,6 +46,7 @@ #include #include #include +#include #define ARR_SIZE(arr) sizeof(arr)/sizeof(arr[0]) @@ -83,14 +84,14 @@ #define bswap_32(x) ntohl(x) -#else +#else #ifdef __FreeBSD__ #define SWAPL(l) ntohl(l) #include #else // Linux #include #include -#endif +#endif #endif // __DJGPP__ @@ -218,7 +219,7 @@ int cntx_int_spi_get_status_data(mflash* mfl, u_int8_t op_type, u_int32_t* statu // Write/Erase delays // ------------------ -// The below delays improve CPU utilization when doing long operations by +// The below delays improve CPU utilization when doing long operations by // sleeping instead of full throtle polling. // Their values are set so they will not lenghen burn time (at least not by a meaningfull duration) // and will save cpu. The delays are divided to an initial_delay, and then retry num_of_retries times waiting retry_delay. @@ -868,7 +869,7 @@ int st_spi_wait_wip(mflash* mfl, u_int32_t init_delay_us, u_int32_t retry_delay_ for (i = 0; i < num_of_retries; ++i) { rc = mfl->f_spi_status(mfl, SFC_RDSR, &status); CHECK_RC(rc); if ((status & 1) == 0) { - return MFE_OK; + return MFE_OK; } usleep(retry_delay_us); } @@ -2104,7 +2105,7 @@ int sx_flash_init(mflash* mfl, flash_params_t* flash_params) return MFE_OK; } -#ifndef _MTCR_UL_ +#ifndef MST_UL int icmd_init(mflash *mfl) { mfl->cif_dev = gcif_open(mfl->mf); @@ -2348,7 +2349,7 @@ int mf_close (mflash* mfl) { } -#ifndef _MTCR_UL_ +#ifndef MST_UL if (mfl->cif_dev) { gcif_close(mfl->cif_dev); } diff --git a/mflash/mflash_common.c b/mflash/mflash_common.c index a44ef9f..404b665 100755 --- a/mflash/mflash_common.c +++ b/mflash/mflash_common.c @@ -1,25 +1,25 @@ /* * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. - * + * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU * General Public License (GPL) Version 2, available from the file * COPYING in the main directory of this source tree, or the * OpenIB.org BSD license below: - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above * copyright notice, this list of conditions and the following * disclaimer. - * + * * - Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -37,6 +37,7 @@ #include "mflash.h" #include "mflash_common.h" +#include "mflash_inband.h" int init_operation_tlv(struct OperationTlv *operation_tlv, u_int16_t reg_id, u_int8_t method) { diff --git a/mflash/mflash_common.h b/mflash/mflash_common.h index 9d03e6c..f948bec 100755 --- a/mflash/mflash_common.h +++ b/mflash/mflash_common.h @@ -1,25 +1,25 @@ /* * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. - * + * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU * General Public License (GPL) Version 2, available from the file * COPYING in the main directory of this source tree, or the * OpenIB.org BSD license below: - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above * copyright notice, this list of conditions and the following * disclaimer. - * + * * - Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -44,7 +44,7 @@ #include #include "internal_packets.h" -#ifndef _MTCR_UL_ +#ifndef MST_UL #include "cib_cif.h" #else typedef void gcif_dev_t; diff --git a/mlxfwops/lib/Makefile.am b/mlxfwops/lib/Makefile.am index 2399723..9f99352 100755 --- a/mlxfwops/lib/Makefile.am +++ b/mlxfwops/lib/Makefile.am @@ -31,32 +31,27 @@ #-- # Makefile.am -- Process this file with automake to produce Makefile.in -USER_DIR = ../.. -MTCR_DIR = $(USER_DIR)/mtcr_ul -MFLASH_DIR = $(USER_DIR)/mflash -MINIXZ_DIR = $(USER_DIR)/ext_libs/minixz -LIBMFA_DIR = $(USER_DIR)/libmfa -COMMON_DIR = $(USER_DIR)/common -LAYOUTS_DIR = $(USER_DIR)/tools_layouts - - -INCLUDES = -I. -I.. -I$(MTCR_DIR) -I$(MFLASH_DIR) -I$(LIBMFA_DIR) -I$(USER_DIR)/ext_libs/json -I$(MINIXZ_DIR)\ +MTCR_DIR = $(top_srcdir)/mtcr_ul +MFLASH_DIR = $(top_srcdir)/mflash +MINIXZ_DIR = $(top_srcdir)/ext_libs/minixz +LIBMFA_DIR = $(top_srcdir)/libmfa +COMMON_DIR = $(top_srcdir)/common +LAYOUTS_DIR = $(top_srcdir)/tools_layouts + +INCLUDES = -I$(srcdir) -I$(MTCR_DIR) -I$(MFLASH_DIR) -I$(LIBMFA_DIR) -I$(USER_DIR)/ext_libs/json -I$(MINIXZ_DIR)\ -I$(COMMON_DIR) -I$(MFT_EXT_LIBS_INC_DIR)/zlib -I $(LAYOUTS_DIR) -I$(top_srcdir)/common - MLXFWOPS_VERSION = 1 AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe -DNO_MFA_SUPPORT -lib_LTLIBRARIES = libmlxfwops.la +noinst_LIBRARIES = libmlxfwops.a -libmlxfwops_la_SOURCES = flint_base.cpp \ +libmlxfwops_a_SOURCES = flint_base.cpp \ flint_io.cpp \ fw_ops.cpp \ - fs2_ops.cpp fs2_ops.h\ - fs3_ops.cpp fs3_ops.h\ - mlxfwops.cpp mlxfwops.h - -mlxfwopsincludedir=$(includedir)/mft/mlxfwops -mlxfwopsinclude_HEADERS = mlxfwops_com.h mlxfwops.h fw_ops.h flint_base.h flint_io.h + fs2_ops.cpp fs2_ops.h \ + fs3_ops.cpp fs3_ops.h \ + mlxfwops.cpp mlxfwops.h \ + mlxfwops_com.h mlxfwops.h fw_ops.h flint_base.h flint_io.h diff --git a/mstdump/crd_lib/Makefile.am b/mstdump/crd_lib/Makefile.am index 28da9b2..a88781f 100755 --- a/mstdump/crd_lib/Makefile.am +++ b/mstdump/crd_lib/Makefile.am @@ -33,20 +33,9 @@ # Makefile.am -- Process this file with automake to produce Makefile.in +INCLUDES = -I. -I$(top_srcdir)/include/mtcr_ul +AM_CFLAGS = -Wall -W -g -MP -MD -pipe -Wno-unused-function $(COMPILER_FPIC) -DMTCR_EXPORT -DMST_UL -DDATA_PATH=\"$(pkgdatadir)\" -USER_DIR=../.. -MTCR_DIR = $(USER_DIR)/mtcr_ul -INCLUDES = -I. \ - -I$(MTCR_DIR) -I$(USER_DIR)/ - -AM_CFLAGS = -Wall -W -g -MP -MD -pipe -Wno-unused-function $(COMPILER_FPIC) -DDATA_PATH=\"$(pkgdatadir)\" - - -libraryincludedir=$(includedir)/mft/mstdump/ -libraryinclude_HEADERS = crdump.h -lib_LTLIBRARIES = libcrdump.la - - -libcrdump_la_SOURCES = crdump.c -libcrdump_la_CFLAGS = $(AM_CFLAGS) +noinst_LIBRARIES = libcrdump.a +libcrdump_a_SOURCES = crdump.c crdump.h diff --git a/mstdump/crd_lib/crdump.c b/mstdump/crd_lib/crdump.c index 359c142..b1c74d3 100755 --- a/mstdump/crd_lib/crdump.c +++ b/mstdump/crd_lib/crdump.c @@ -104,7 +104,7 @@ Store the csv file path at csv_file_path. */ static int crd_get_csv_path(IN dm_dev_id_t dev_type, OUT char *csv_file_path); -/* +/* count number of dwords, and store all needed data from csv file at parsed_csv */ static int crd_count_double_word(IN char *csv_file_path, OUT u_int32_t *number_of_dwords, OUT crd_parsed_csv_t blocks[], IN int is_full); @@ -271,7 +271,7 @@ int crd_dump_data(IN crd_ctxt_t *context, OUT crd_dword_t* dword_arr, IN crd_cal return CRD_EXCEED_VALUE; } addr = context->blocks[i].addr + (j * sizeof(u_int32_t)); - + if (context->cause_addr >= 0) { /* if we want to check cause bit - read it and verify it hasn't been raised */ if (mread4(context->mf, context->cause_addr, &cause_reg) != sizeof(u_int32_t)) { CRD_DEBUG("Cr read (0x%08x) failed: %s(%d)\n", context->cause_addr, strerror(errno), (u_int32_t)errno); @@ -545,6 +545,9 @@ static int crd_update_csv_path(IN OUT char *csv_file_path) { crd_get_exec_name_from_path(csv_file_path, exec_name); crd_replace(csv_file_path, exec_name, "mstdump_dbs\\"); found = 1; +#elif defined MST_UL + strcat(csv_file_path, DATA_PATH "/"); + found = 1; #else char conf_path[256] = "/etc/mft/mft.conf"; char *data_path; @@ -571,7 +574,6 @@ static int crd_update_csv_path(IN OUT char *csv_file_path) { } } } - //strcat(csv_file_path, DATA_PATH "/mstdump_dbs/"); #endif if (!found) { return CRD_CONF_BAD_FORMAT; diff --git a/mstdump/crd_main/Makefile.am b/mstdump/crd_main/Makefile.am index 5b7ab43..ab36e07 100755 --- a/mstdump/crd_main/Makefile.am +++ b/mstdump/crd_main/Makefile.am @@ -31,15 +31,11 @@ #-- # Makefile.am -- Process this file with automake to produce Makefile.in -MTCR_DIR = ../../mtcr_ul -USER_DIR = ../.. -INCLUDES = -I. -I ../crd_lib -I$(MTCR_DIR) -I$(USER_DIR) -I../../udump/mstdump +INCLUDES = -I. -I$(srcdir)/../crd_lib -I$(top_srcdir)/include/mtcr_ul +AM_CFLAGS = -MD -pipe -g -Wall -W -AM_CPPFLAGS = -MD -pipe -g -Wall -W -Werror +bin_PROGRAMS = mstregdump -bin_PROGRAMS = mstdump - -mstdump_SOURCES = mstdump.c - -mstdump_LDADD = ../crd_lib/libcrdump.la $(USER_DIR)/dev_mgt/libdev_mgt.la $(MTCR_DIR)/libmtcr_ul.a -lm -ldl +mstregdump_SOURCES = mstdump.c +mstregdump_LDADD = ../crd_lib/libcrdump.a ../../dev_mgt/libdev_mgt.a ../../mtcr_ul/libmtcr_ul.a -lm -ldl diff --git a/mstdump/mstdump_dbs/Makefile.am b/mstdump/mstdump_dbs/Makefile.am index 4e51653..fd2e593 100644 --- a/mstdump/mstdump_dbs/Makefile.am +++ b/mstdump/mstdump_dbs/Makefile.am @@ -29,8 +29,6 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. #-- - - -docdir = $(pkgdatadir)/mstdump_dbs -dist_doc_DATA = *.csv +mstregdumpdir = $(datadir)/@PACKAGE@ +dist_mstregdump_DATA = *.csv diff --git a/mstflint.spec.in b/mstflint.spec.in index 11b5d62..1e0c84d 100644 --- a/mstflint.spec.in +++ b/mstflint.spec.in @@ -41,9 +41,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mstmcra %{_bindir}/hca_self_test.ofed %{_includedir}/mtcr_ul/mtcr.h +%{_libdir}/libmtcr_ul.a %{_datadir}/mstflint %changelog +* Tue Dec 24 2013 Oren Kladnitsky + MFT 3.5.0 Updates * Wed Mar 20 2013 Oren Kladnitsky MFT 3.0.0 diff --git a/mtcr_ul/Makefile.am b/mtcr_ul/Makefile.am index 3feafd8..f9f3e12 100644 --- a/mtcr_ul/Makefile.am +++ b/mtcr_ul/Makefile.am @@ -35,10 +35,9 @@ INCLUDES = -I$(top_srcdir)/include/mtcr_ul lib_LIBRARIES = libmtcr_ul.a -libmtcr_ul_a_SOURCES = mtcr_ul.c mtcr_ib_ofed.c mtcr_ib.h mtcr_int_defs.h +libmtcr_ul_a_SOURCES = mtcr_ul.c mtcr_ib_ofed.c mtcr_ib.h mtcr_int_defs.h libmtcr_ul_a_CFLAGS = -W -g -MP -MD -fPIC -DMTCR_API="" -DMST_UL - libraryincludedir=$(includedir)/mtcr_ul libraryinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h diff --git a/small_utils/Makefile.am b/small_utils/Makefile.am index c38b463..838a724 100644 --- a/small_utils/Makefile.am +++ b/small_utils/Makefile.am @@ -1,25 +1,25 @@ #-- # Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. -# +# # This software is available to you under a choice of one of two # licenses. You may choose to be licensed under the terms of the GNU # General Public License (GPL) Version 2, available from the file # COPYING in the main directory of this source tree, or the # OpenIB.org BSD license below: -# +# # Redistribution and use in source and binary forms, with or # without modification, are permitted provided that the following # conditions are met: -# +# # - Redistributions of source code must retain the above # copyright notice, this list of conditions and the following # disclaimer. -# +# # - Redistributions in binary form must reproduce the above # copyright notice, this list of conditions and the following # disclaimer in the documentation and/or other materials # provided with the distribution. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -30,10 +30,7 @@ # SOFTWARE. #-- -USER_DIR = .. -COMMON_DIR = $(USER_DIR)/common - -INCLUDES= -I$(top_srcdir)/include/mtcr_ul -I $(COMMON_DIR) +INCLUDES= -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common LDADD= ../mtcr_ul/libmtcr_ul.a -ldl @@ -44,8 +41,8 @@ bin_PROGRAMS = mstmread \ mstvpd bin_SCRIPTS = hca_self_test.ofed - -mstmread_SOURCES = mread.c + +mstmread_SOURCES = mread.c mstmwrite_SOURCES = mwrite.c @@ -54,4 +51,4 @@ mstvpd_SOURCES = vpd.c mstmcra_SOURCES = mcra.c mstmtserver_SOURCES = mtserver.c tcp.c tcp.h -mstmtserver_CFLAGS = -DMST_UL +mstmtserver_CFLAGS = -DMST_UL diff --git a/tools_layouts/Makefile.am b/tools_layouts/Makefile.am index 3e6eaac..64c171f 100644 --- a/tools_layouts/Makefile.am +++ b/tools_layouts/Makefile.am @@ -31,17 +31,9 @@ #-- # Makefile.am -- Process this file with automake to produce Makefile.in -USER_DIR = .. -MTCR_DIR = $(USER_DIR)/mtcr_ul -INCLUDES = -I$(USER_DIR) -I$(MTCR_DIR) -I$(USER_DIR)/common #-I$(MFT_EXT_LIBS_INC_DIR) -AM_CFLAGS = -Wall -W -g -MP -MD -pipe $(COMPILER_FPIC) -lib_LTLIBRARIES = libtools_layouts.la +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 -libraryincludedir=$(includedir)/mstmft/tools_layouts/ - -libraryinclude_HEADERS = adb_to_c_utils.h cibfw_layouts.h - -libtools_layouts_la_SOURCES = cibfw_layouts.c adb_to_c_utils.c -#libtools_layouts_la_DEPENDENCIES = $(USER_DIR)/xz_utils/libxz_utils.la $(USER_DIR)/tools_crypto/libtools_crypto.la -#libtools_layouts_la_LIBADD = $(USER_DIR)/xz_utils/libxz_utils.la $(USER_DIR)/tools_crypto/libtools_crypto.la $(WS2_LIB) +libtools_layouts_a_SOURCES = cibfw_layouts.c adb_to_c_utils.c adb_to_c_utils.h cibfw_layouts.h -- 2.41.0