diff options
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 0d9116b535..76f1dc8d1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,20 +26,11 @@ AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' \ -DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' \ -DDEBUG_ABSSRCDIR='"@abs_srcdir@"' \ ${include_paths} -AM_LDFLAGS = -pthread -Wl,-E $(ZLIB_LIBS) -loolforkit_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib -loolforkit_nocaps_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib -loolmount_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib -loolnb_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib -loolwsd_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib -loolwsd_fuzzer_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib + +AM_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib $(ZLIB_LIBS) if ENABLE_SSL -loolforkit_LDFLAGS += -lssl -lcrypto -loolforkit_nocaps_LDFLAGS += -lssl -lcrypto -loolnb_LDFLAGS += -lssl -lcrypto -loolwsd_LDFLAGS += -lssl -lcrypto -loolwsd_fuzzer_LDFLAGS += -lssl -lcrypto +AM_LDFLAGS += -lssl -lcrypto endif loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 -DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS) diff --git a/test/Makefile.am b/test/Makefile.am index 9008efa162..6be2a53566 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -20,7 +20,7 @@ noinst_LTLIBRARIES = \ unit-minsocketbuffersize.la MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy -AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION) +AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION) $(ZLIB_LIBS) # We work around some of the mess of using the same sources both on # the server side and here in unit tests with conditional compilation |