diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-03-31 14:42:10 +0530 |
|---|---|---|
| committer | pranavk <pranavk@collabora.co.uk> | 2017-03-31 09:17:56 +0000 |
| commit | 453a452ff9d1dcee7e26d0243ddd79dca32c0f13 (patch) | |
| tree | af059f40ce90b421f5f66208f79306a4a147f813 /Makefile.am | |
| parent | loleaflet: Annotate readonly users in userlist (diff) | |
| download | online-453a452ff9d1dcee7e26d0243ddd79dca32c0f13.tar.gz online-453a452ff9d1dcee7e26d0243ddd79dca32c0f13.zip | |
Makefile: Simplify and link zlib properly
Without this, online doesn't link, atleast for me. The problem seems to
be because in presence of target specific _LDFLAGS, AM_LDFLAGS is
ignored and it is only the latter where we are specifying ZLIB_LIBS.
Further, since the LDFLAGS values are same for all targets, we can
simplify here and rather use AM_LDFLAGS and remove all target specific
LDFLAGS.
Change-Id: I2f1c30c7f34b32c638a4ac60fab709b32f1e6c9a
Reviewed-on: https://gerrit.libreoffice.org/35959
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 3 insertions, 12 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) |