Skip to content

Commit 6562926

Browse files
vjardinVincent Jardin
authored andcommitted
Makefile.am: fix non static linkage
I do not understand why some -static are enforced while dynamic linkage could be used.
1 parent 37e382f commit 6562926

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

cmdif/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ libcmdif_la_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.
5353
cmdif_pylibdir = $(libdir)/mstflint/python_tools/
5454
cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py
5555
${CCMDIF_SO}: libcmdif.la
56-
$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${CCMDIF_SO} \
57-
$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
56+
$(CC) -g -Wall -pthread -shared ${CFLAGS} .libs/*.o -o ${CCMDIF_SO} \
57+
$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.so
5858

5959
CLEANFILES = ${CCMDIF_SO}

dev_mgt/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ dev_mgt_pylib_DATA = c_dev_mgt.so
5050
dist_dev_mgt_pylib_DATA = dev_mgt.py
5151

5252
c_dev_mgt.so: libdev_mgt.la
53-
$(CC) -g -Wall -pthread -shared ${CFLAGS} tools_dev_types.o -o c_dev_mgt.so \
53+
$(CC) -g -Wall -pthread -shared ${CFLAGS} .libs/tools_dev_types.o -o c_dev_mgt.so \
5454
$(top_builddir)/reg_access/.libs/libreg_access.a \
5555
$(top_builddir)/tools_layouts/.libs/libtools_layouts.a \
56-
$(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
56+
$(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.so
5757

5858
CLEANFILES = c_dev_mgt.so

flint/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ mstflint_DEPENDENCIES = \
7171

7272
LDADD_mstflint = ${LDL}
7373

74-
mstflint_LDFLAGS = -static
74+
#mstflint_LDFLAGS = -static
7575

7676
if ENABLE_DC
7777
LDADD_mstflint += -lz

mlxconfig/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ mstconfig_DEPENDENCIES = \
9898

9999
mstconfig_LDADD = $(mstconfig_DEPENDENCIES) ${LDL}
100100

101-
mstconfig_LDFLAGS = -static
101+
#mstconfig_LDFLAGS = -static
102102

103103
if DISABLE_XML2
104104
AM_CXXFLAGS += -DDISABLE_XML2

mstdump/crd_main/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ bin_PROGRAMS = mstregdump
3939
mstregdump_SOURCES = mstdump.c
4040
mstregdump_LDADD = ../crd_lib/libcrdump.a ../../dev_mgt/libdev_mgt.la ../../reg_access/libreg_access.la ../../tools_layouts/libtools_layouts.la \
4141
../../${MTCR_CONF_DIR}/libmtcr_ul.la -lm ${LDL}
42-
mstregdump_LDFLAGS = -static
42+
#mstregdump_LDFLAGS = -static
4343
mstregdump_CFLAGS = -DMSTDUMP_NAME=\"mstregdump\" -DDEV_EXAMPLE=\"0b:00.0\"

mtcr_py/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ mtcr_pylibdir = $(libdir)/mstflint/python_tools/
3535
mtcr_pylib_DATA = cmtcr.so
3636
dist_mtcr_pylib_DATA = mtcr.py
3737
cmtcr.so:
38-
$(CC) -g -Wall -pthread -shared ${CFLAGS} -o cmtcr.so -Wl,--whole-archive $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a -Wl,--no-whole-archive
38+
$(CC) -g -Wall -pthread -shared ${CFLAGS} -o cmtcr.so $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.so
3939

4040
CLEANFILES = cmtcr.so

reg_access/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO}
5757
dist_reg_access_pylib_DATA = regaccess.py regaccess_hca_ext_structs.py regaccess_switch_ext_structs.py
5858

5959
${RREG_ACCESS_SO}: libreg_access.la
60-
$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \
61-
$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
60+
$(CC) -g -Wall -pthread -shared ${CFLAGS} .libs/*.o -o ${RREG_ACCESS_SO} \
61+
$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.so
6262

6363
CLEANFILES = ${RREG_ACCESS_SO}

resourcetools/resourcedump_lib/src/sdk/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ libraryinclude_HEADERS = \
6363
# if WIN_BUILD
6464
# MTCR_LIB = $(MTCR_DIR)/.libs/libmtcr.dll.a
6565
# else
66-
MTCR_LIB = $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
66+
MTCR_LIB = $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.so
6767
# endif
6868

6969
if ENABLE_RDMEM
@@ -86,7 +86,7 @@ resource_dump_sdk_so_DEPS = \
8686

8787
# if !WIN_BUILD
8888
libresource_dump_sdk.so: libresource_dump_sdk.la
89-
$(CC) -Wall -pthread -shared ${CFLAGS} $(COMPILER_FPIC) libresource_dump_sdk_la-resource_dump_sdk.o \
89+
$(CC) -Wall -pthread -shared ${CFLAGS} $(COMPILER_FPIC) .libs/libresource_dump_sdk_la-resource_dump_sdk.o \
9090
-o libresource_dump_sdk.so ${AM_LDFLAGS} $(resource_dump_sdk_so_DEPS)
9191
# else
9292
# libresource_dump_sdk.dll: libresource_dump_sdk.la

small_utils/Makefile.am

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ bin_SCRIPTS = mstfwreset
4747
mstmread_SOURCES = mread.c
4848
mstmread_DEPENDENCIES = $(top_builddir)/${MTCR_CONF_DIR}/libmtcr_ul.la
4949
mstmread_LDADD = $(mstmread_DEPENDENCIES) ${LDL}
50-
mstmread_LDFLAGS = -static
50+
#mstmread_LDFLAGS = -static
5151

5252
mstmwrite_SOURCES = mwrite.c
5353
mstmwrite_DEPENDENCIES = $(top_builddir)/${MTCR_CONF_DIR}/libmtcr_ul.la
5454
mstmwrite_LDADD = $(mstmwrite_DEPENDENCIES) ${LDL}
55-
mstmwrite_LDFLAGS = -static
55+
#mstmwrite_LDFLAGS = -static
5656

5757
mstvpd_SOURCES = vpd.c
5858
mstvpd_DEPENDENCIES = $(top_builddir)/mvpd/libmvpd.la \
@@ -61,7 +61,7 @@ mstvpd_DEPENDENCIES = $(top_builddir)/mvpd/libmvpd.la \
6161
$(top_builddir)/reg_access/libreg_access.la \
6262
$(top_builddir)/tools_layouts/libtools_layouts.la
6363
mstvpd_LDADD = $(mstvpd_DEPENDENCIES) ${LDL}
64-
mstvpd_LDFLAGS = -static
64+
#mstvpd_LDFLAGS = -static
6565

6666
mstcongestion_SOURCES = congestion.cpp
6767
mstcongestion_DEPENDENCIES = $(top_builddir)/cmdif/libcmdif.la \
@@ -71,12 +71,12 @@ mstcongestion_DEPENDENCIES = $(top_builddir)/cmdif/libcmdif.la \
7171
$(top_builddir)/cmdparser/libcmdparser.a \
7272
$(top_builddir)/${MTCR_CONF_DIR}/libmtcr_ul.la
7373
mstcongestion_LDADD = $(mstcongestion_DEPENDENCIES) ${LDL}
74-
mstcongestion_LDFLAGS = -static
74+
#mstcongestion_LDFLAGS = -static
7575

7676
mstmcra_SOURCES = mcra.c
7777
mstmcra_DEPENDENCIES = $(top_builddir)/${MTCR_CONF_DIR}/libmtcr_ul.la
7878
mstmcra_LDADD = $(mstmcra_DEPENDENCIES) ${LDL}
79-
mstmcra_LDFLAGS = -static
79+
#mstmcra_LDFLAGS = -static
8080

8181
if LINUX_BUILD
8282
bin_PROGRAMS += mstfwctrl
@@ -86,14 +86,14 @@ mstfwctrl_DEPENDENCIES = $(top_builddir)/${MTCR_CONF_DIR}/libmtcr_ul.la \
8686
$(top_builddir)/dev_mgt/libdev_mgt.la \
8787
$(top_builddir)/reg_access/libreg_access.la
8888
mstfwctrl_LDADD = $(mstfwctrl_DEPENDENCIES) ${LDL}
89-
mstfwctrl_LDFLAGS = -static
89+
#mstfwctrl_LDFLAGS = -static
9090
endif
9191

9292
mstmtserver_SOURCES = mtserver.c tcp.c tcp.h
9393
mstmtserver_CFLAGS = -DMST_UL
9494
mstmtserver_DEPENDENCIES = $(top_builddir)/${MTCR_CONF_DIR}/libmtcr_ul.la
9595
mstmtserver_LDADD = $(mstmtserver_DEPENDENCIES) ${LDL}
96-
mstmtserver_LDFLAGS = -static
96+
#mstmtserver_LDFLAGS = -static
9797

9898
SUBDIRS = mlxfwresetlib
9999
MSTFWRESET_PYTHON_WRAPPER=mstfwreset

0 commit comments

Comments
 (0)