[vlc-commits] projectM: avoid genmf

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 22 18:48:12 2013 +0300| [05332465edb3d712b94761ff2bffd40d2b55dfb4] | committer: Rémi Denis-Courmont

projectM: avoid genmf

Also do not define unused PROJECTM2_(CFLAGS|LIBS) substitutions.

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

 configure.ac                     |    4 +---
 modules/visualization/Modules.am |    7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7c5fd38..6da74e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3903,9 +3903,7 @@ AS_IF([test "${enable_projectm}" != "no"],
     PKG_CHECK_MODULES(PROJECTM, libprojectM,
     [
       VLC_ADD_PLUGIN([projectm])
-      VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS])
-      VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS])
-      PKG_CHECK_MODULES(PROJECTM2, [libprojectM >= 2.0.0],
+      PKG_CHECK_EXISTS([libprojectM >= 2.0.0],
         [ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM 2.x]) ],
         [ AC_MSG_WARN( [Using libprojectM version 1] )
       ])
diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am
index 27ac323..37fe765 100644
--- a/modules/visualization/Modules.am
+++ b/modules/visualization/Modules.am
@@ -1,5 +1,10 @@
 SOURCES_goom = goom.c
-SOURCES_projectm = projectm.cpp
+
+libprojectm_plugin_la_SOURCES = projectm.cpp
+libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
+libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS)
+EXTRA_LTLIBRARIES += libprojectm_plugin.la
+visualization_LTLIBRARIES += $(LTLIBprojectm)
 
 libvisual_plugin_la_SOURCES = \
 	visual/visual.c visual/visual.h \