tests: fix DSO link error in case of --enable-mclib.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2017-12-03 09:25:22 +03:00
parent b7c54f64bb
commit 3ae7ad4449
10 changed files with 55 additions and 11 deletions

View File

@ -6,7 +6,12 @@ AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
AM_LDFLAGS = @TESTS_LDFLAGS@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
EXTRA_DIST = utilunix__my_system-common.c EXTRA_DIST = utilunix__my_system-common.c

View File

@ -8,7 +8,12 @@ AM_CPPFLAGS = \
AM_LDFLAGS = @TESTS_LDFLAGS@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ $(top_builddir)/lib/libmc.la LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
TESTS = \ TESTS = \
config_string \ config_string \

View File

@ -7,7 +7,12 @@ AM_CPPFLAGS = \
@CHECK_CFLAGS@ \ @CHECK_CFLAGS@ \
@PCRE_CPPFLAGS@ @PCRE_CPPFLAGS@
LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la @PCRE_LIBS@
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
TESTS = \ TESTS = \
glob_prepare_replace_str \ glob_prepare_replace_str \

View File

@ -6,7 +6,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/search \ -I$(top_srcdir)/lib/search \
@CHECK_CFLAGS@ @CHECK_CFLAGS@
LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
TESTS = \ TESTS = \
replace__str_replace_all \ replace__str_replace_all \

View File

@ -11,8 +11,12 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
EXTRA_DIST = mc.charsets EXTRA_DIST = mc.charsets
LIBS=@CHECK_LIBS@ \ LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la $(top_builddir)/lib/libmc.la
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
TESTS = \ TESTS = \
canonicalize_pathname \ canonicalize_pathname \

View File

@ -8,8 +8,12 @@ AM_CPPFLAGS = \
AM_LDFLAGS = @TESTS_LDFLAGS@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ \ LIBS = @CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la $(top_builddir)/lib/libmc.la
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
TESTS = \ TESTS = \
complete_engine complete_engine

View File

@ -14,7 +14,7 @@ AM_CPPFLAGS = \
AM_LDFLAGS = @TESTS_LDFLAGS@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ \ LIBS = @CHECK_LIBS@ \
$(top_builddir)/src/libinternal.la \ $(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la $(top_builddir)/lib/libmc.la
@ -23,6 +23,10 @@ if ENABLE_VFS_SMB
LIBS += $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a LIBS += $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a
endif endif
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
EXTRA_DIST = execute__common.c EXTRA_DIST = execute__common.c
TESTS = \ TESTS = \

View File

@ -9,7 +9,7 @@ AM_CPPFLAGS = \
AM_LDFLAGS = @TESTS_LDFLAGS@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ \ LIBS = @CHECK_LIBS@ \
$(top_builddir)/src/libinternal.la \ $(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la \ $(top_builddir)/lib/libmc.la \
@PCRE_LIBS@ @PCRE_LIBS@
@ -19,6 +19,10 @@ if ENABLE_VFS_SMB
LIBS += $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a LIBS += $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a
endif endif
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
EXTRA_DIST = mc.charsets test-data.txt.in EXTRA_DIST = mc.charsets test-data.txt.in
TESTS = \ TESTS = \

View File

@ -10,7 +10,7 @@ AM_CPPFLAGS = \
AM_LDFLAGS = @TESTS_LDFLAGS@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ \ LIBS = @CHECK_LIBS@ \
$(top_builddir)/src/libinternal.la \ $(top_builddir)/src/libinternal.la \
$(top_builddir)/lib/libmc.la \ $(top_builddir)/lib/libmc.la \
@PCRE_LIBS@ @PCRE_LIBS@
@ -20,6 +20,10 @@ if ENABLE_VFS_SMB
LIBS += $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a LIBS += $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a
endif endif
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
EXTRA_DIST = hints/mc.hint EXTRA_DIST = hints/mc.hint
TESTS = \ TESTS = \

View File

@ -10,6 +10,10 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS = $(top_builddir)/lib/libmc.la LIBS = $(top_builddir)/lib/libmc.la
if ENABLE_MCLIB
LIBS += $(GLIB_LIBS)
endif
# Programs/scripts to build on 'make check'. # Programs/scripts to build on 'make check'.
check_PROGRAMS = mc_parse_ls_l check_PROGRAMS = mc_parse_ls_l
check_SCRIPTS = run check_SCRIPTS = run