Skip to content

Ticket #4803: replace LIBS with LDADD to fix tests deps and linkage #4806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −70
Open

Ticket #4803: replace LIBS with LDADD to fix tests deps and linkage #4806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions tests/lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ SUBDIRS = . mcconfig search strutil vfs widget

AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS) \
@E2P_LIBS@
endif
LDADD = \
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

EXTRA_DIST = utilunix__my_system-common.c

TESTS = \
library_independ \
mc_build_filename \
mc_realpath \
name_quote \
serialize \
terminal \
Expand All @@ -27,8 +24,6 @@ TESTS = \
utilunix__my_system_fork_child \
x_basename

TESTS += mc_realpath

check_PROGRAMS = $(TESTS)

library_independ_SOURCES = \
Expand Down
10 changes: 3 additions & 7 deletions tests/lib/mcconfig/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS) \
@E2P_LIBS@
endif
LDADD = \
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

TESTS = \
config_string \
Expand Down
9 changes: 3 additions & 6 deletions tests/lib/search/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/search \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
LDADD = \
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

TESTS = \
glob_prepare_replace_str \
Expand Down
9 changes: 3 additions & 6 deletions tests/lib/strutil/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
LDADD = \
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

TESTS = \
parse_integer \
Expand Down
10 changes: 3 additions & 7 deletions tests/lib/vfs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@ EXTRA_DIST = mc.charsets.in

CLEANFILES = mc.charsets

LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS) \
@E2P_LIBS@
endif
LDADD = \
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

TESTS = \
canonicalize_pathname \
Expand Down
9 changes: 3 additions & 6 deletions tests/lib/widget/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/vfs \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
LDADD = \
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

TESTS = \
complete_engine \
Expand Down
9 changes: 3 additions & 6 deletions tests/src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ AM_CPPFLAGS = \
-DTEST_SHARE_DIR=\"$(abs_srcdir)/fixtures\" \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
LDADD = \
$(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

EXTRA_DIST = \
fixtures/mc.charsets \
Expand Down
9 changes: 3 additions & 6 deletions tests/src/editor/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
LDADD = \
$(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

EXTRA_DIST = edit_complete_word_cmd_test_data.txt.in

Expand Down
9 changes: 3 additions & 6 deletions tests/src/filemanager/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ AM_CPPFLAGS = \
-DTEST_SHARE_DIR=\"$(abs_srcdir)/../fixtures\" \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
LDADD = \
$(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

TESTS = \
cd_to \
Expand Down
7 changes: 2 additions & 5 deletions tests/src/vfs/extfs/helpers-list/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ SUBDIRS = misc

AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)

LIBS = $(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
LDADD = \
$(top_builddir)/lib/libmc.la

# Programs/scripts to build on 'make check'.
check_PROGRAMS = mc_parse_ls_l
Expand Down
9 changes: 3 additions & 6 deletions tests/src/vfs/ftpfs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/vfs \
@CHECK_CFLAGS@

LIBS = @CHECK_LIBS@ \
LDADD = \
$(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la

if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
$(top_builddir)/lib/libmc.la \
@CHECK_LIBS@

EXTRA_DIST = \
data/aix_list.input \
Expand Down
Loading