[vlc-commits] Revert "freetype: fix static linking."

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Sat Nov  5 19:54:58 2016 +0300| [aaa0687af019093baf9b7b3cb63a778b71addce9] | committer: Konstantin Pavlov

Revert "freetype: fix static linking."

This reverts commit 6c76cb23b0d6c4f85423783a9138be83f7d3667a.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aaa0687af019093baf9b7b3cb63a778b71addce9
---

 modules/text_renderer/Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index 424032d..be98a94 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -9,7 +9,7 @@ libfreetype_plugin_la_SOURCES = \
 	text_renderer/freetype/text_layout.c text_renderer/freetype/text_layout.h
 
 libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
-libfreetype_plugin_la_LIBADD =
+libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS)
 libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
 
 if HAVE_WIN32_DESKTOP
@@ -19,7 +19,7 @@ endif
 if HAVE_FONTCONFIG
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/fontconfig.c
 libfreetype_plugin_la_CPPFLAGS += -DHAVE_FONTCONFIG
-libfreetype_plugin_la_LIBADD += -lfontconfig $(LIBXML2_LIBS)
+libfreetype_plugin_la_LIBADD += -lfontconfig
 endif
 if HAVE_ANDROID
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/android.c
@@ -36,7 +36,6 @@ if HAVE_HARFBUZZ
 libfreetype_plugin_la_CPPFLAGS += $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ
 libfreetype_plugin_la_LIBADD += $(HARFBUZZ_LIBS)
 endif
-libfreetype_plugin_la_LIBADD += $(LIBM) $(LIBS_freetype) $(FREETYPE_LIBS)
 if HAVE_FREETYPE
 text_LTLIBRARIES += libfreetype_plugin.la
 endif