commit 04c0cce43e255eaf1350ceddee2b03585310bfdc
Author: Enrico Forestieri <[email protected]>
Date: Sun Jan 31 15:21:23 2021 +0100
Fix make check
We have to explicitly link zlib after [197ea636/lyxgit].
---
src/support/Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 3dedf57..925cb62 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -173,28 +173,28 @@ ADD_FRAMEWORKS = \
-Wl,-headerpad_max_install_names
endif
-check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS)
$(LIBSHLWAPI) @LIBS@
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS)
$(LIBSHLWAPI) @LIBS@
check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_convert_SOURCES = \
tests/check_convert.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS)
$(LIBSHLWAPI) @LIBS@
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_filetools_SOURCES = \
tests/check_filetools.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS)
$(LIBSHLWAPI) @LIBS@
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_lstrings_SOURCES = \
tests/check_lstrings.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS)
$(LIBSHLWAPI) @LIBS@
+check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_trivstring_SOURCES = \
tests/check_trivstring.cpp \
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
