[vlc-commits] text_renderers: clean the Makefile

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Oct 25 19:31:10 2015 +0100| [34b3bbcd09651117965fa1842aea153696e6f029] | committer: Jean-Baptiste Kempf

text_renderers: clean the Makefile

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

 modules/text_renderer/Makefile.am |   54 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index a40ab7e..e010f09 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -8,27 +8,27 @@ libfreetype_plugin_la_SOURCES = \
 	text_renderer/freetype.c text_renderer/freetype.h \
 	text_renderer/text_layout.c text_renderer/text_layout.h
 
+libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
+libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS)
+libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
+
 if HAVE_WIN32
+if !HAVE_WINSTORE
 libfreetype_plugin_la_SOURCES += text_renderer/fonts/win32.c
+libfreetype_plugin_la_LIBADD += -liconv -lz -lgdi32 -lusp10
+endif
 endif
 if HAVE_FONTCONFIG
 libfreetype_plugin_la_SOURCES += text_renderer/fonts/fontconfig.c
+libfreetype_plugin_la_CPPFLAGS += -DHAVE_FONTCONFIG
+libfreetype_plugin_la_LIBADD += -lfontconfig
 endif
 if HAVE_ANDROID
 libfreetype_plugin_la_SOURCES += text_renderer/fonts/android.c
 endif
 if HAVE_DARWIN
 libfreetype_plugin_la_SOURCES += text_renderer/fonts/darwin.c
-endif
-
-libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
-libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS)
-if HAVE_FREETYPE
-text_LTLIBRARIES += libfreetype_plugin.la
-endif
-if HAVE_FONTCONFIG
-libfreetype_plugin_la_CPPFLAGS += -DHAVE_FONTCONFIG
-libfreetype_plugin_la_LIBADD += -lfontconfig
+libfreetype_plugin_la_LDFLAGS += -Wl,-framework,Carbon
 endif
 if HAVE_FRIBIDI
 libfreetype_plugin_la_CPPFLAGS += $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI
@@ -38,44 +38,42 @@ if HAVE_HARFBUZZ
 libfreetype_plugin_la_CPPFLAGS += $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ
 libfreetype_plugin_la_LIBADD += $(HARFBUZZ_LIBS)
 endif
-libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
-if HAVE_DARWIN
-libfreetype_plugin_la_LDFLAGS += -Wl,-framework,Carbon
+if HAVE_FREETYPE
+text_LTLIBRARIES += libfreetype_plugin.la
 endif
 
+# SVG plugin
+libsvg_plugin_la_SOURCES = text_renderer/svg.c
+libsvg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SVG_CFLAGS)
+libsvg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(textdir)'
+libsvg_plugin_la_LIBADD = $(SVG_LIBS)
+EXTRA_LTLIBRARIES += libsvg_plugin.la
+text_LTLIBRARIES += $(LTLIBsvg)
+
+# QuartzText
 libquartztext_plugin_la_SOURCES = text_renderer/quartztext.c
 libquartztext_plugin_la_LDFLAGS = $(AM_LDLFAGS) -rpath '$(textdir)' \
 	-Wl,-framework,ApplicationServices
 EXTRA_LTLIBRARIES += libquartztext_plugin.la
 text_LTLIBRARIES += $(LTLIBquartztext)
 
-if HAVE_OSX
+# OS X TTS
 libnsspeechsynthesizer_plugin_la_SOURCES = text_renderer/nsspeechsynthesizer.m
 libnsspeechsynthesizer_plugin_la_LDFLAGS = -Wl,-framework,Cocoa
+if HAVE_OSX
 text_LTLIBRARIES += libnsspeechsynthesizer_plugin.la
 endif
 
-if HAVE_SAPI
+# SAPI TTS (win32)
 libsapi_plugin_la_SOURCES = text_renderer/sapi.cpp
 libsapi_plugin_la_LIBADD = -lole32
-if HAVE_WIN32
+if HAVE_SAPI
 text_LTLIBRARIES += libsapi_plugin.la
 endif
-endif
-
-libsvg_plugin_la_SOURCES = text_renderer/svg.c
-libsvg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SVG_CFLAGS)
-libsvg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(textdir)'
-libsvg_plugin_la_LIBADD = $(SVG_LIBS)
-EXTRA_LTLIBRARIES += libsvg_plugin.la
-text_LTLIBRARIES += $(LTLIBsvg)
 
+# Simple GDI renderer
 libwin32text_plugin_la_SOURCES = text_renderer/win32text.c
 libwin32text_plugin_la_LIBADD = -lgdi32
 if HAVE_WIN32
-libfreetype_plugin_la_LIBADD += -liconv -lz
-if !HAVE_WINSTORE
-libfreetype_plugin_la_LIBADD += -lgdi32 -lusp10
 text_LTLIBRARIES += libwin32text_plugin.la
 endif
-endif