[vlc-commits] caca: convert to automake

Rémi Denis-Courmont git at videolan.org
Sun May 13 21:56:00 CEST 2012


vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 13 22:30:11 2012 +0300| [6abd243ff410dc5aa9352d208b8235f0989da670] | committer: Rémi Denis-Courmont

caca: convert to automake

(cherry picked from commit 52197b014bebfd9744aac4ad34f3e3d379abd53c)

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

 modules/video_output/Modules.am |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 426b60f..134f2e7 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -5,7 +5,6 @@ SUBDIRS = msw
 LIBTOOL=@LIBTOOL@ --tag=CC
 
 SOURCES_aa = aa.c
-SOURCES_caca = caca.c
 SOURCES_fb = fb.c
 SOURCES_vout_sdl = sdl.c
 SOURCES_directfb = directfb.c
@@ -132,6 +131,14 @@ libegl_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += libegl_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBegl)
 
+### Coloured ASCII art ###
+libcaca_plugin_la_SOURCES = caca.c
+libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
+libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
+libcaca_plugin_la_DEPENDENCIES =
+EXTRA_LTLIBRARIES += libcaca_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBcaca)
+
 ### Common ###
 libvdummy_plugin_la_SOURCES = vdummy.c
 libvdummy_plugin_la_CFLAGS = $(AM_CFLAGS)



More information about the vlc-commits mailing list