[vlc-commits] meta_engine: avoid genmf

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 15 23:26:24 2013 +0300| [eba0cc12cf35c2b8b6a34b964c8f11b524999351] | committer: Rémi Denis-Courmont

meta_engine: avoid genmf

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

 configure.ac                    |    2 --
 modules/meta_engine/.gitignore  |    1 -
 modules/meta_engine/Makefile.am |   13 +++++++++++++
 modules/meta_engine/Modules.am  |    5 -----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index a905618..a7df70e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4057,8 +4057,6 @@ AC_ARG_ENABLE(taglib,
 AS_IF([test "${enable_taglib}" != "no"], [
   PKG_CHECK_MODULES(TAGLIB, taglib >= 1.6.1, [
     VLC_ADD_PLUGIN([taglib])
-    VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz])
-    VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS])
   ], [
     AC_MSG_WARN([${TAGLIB_PKG_ERRORS}.])])
 ])
diff --git a/modules/meta_engine/.gitignore b/modules/meta_engine/.gitignore
deleted file mode 100644
index 08a6d72..0000000
--- a/modules/meta_engine/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/meta_engine/Makefile.am b/modules/meta_engine/Makefile.am
new file mode 100644
index 0000000..efa32f1
--- /dev/null
+++ b/modules/meta_engine/Makefile.am
@@ -0,0 +1,13 @@
+include ../common.am
+metadir = $(pluginsdir)/meta_engine
+EXTRA_LTLIBRARIES =
+
+libfolder_plugin_la_SOURCES = folder.c
+meta_LTLIBRARIES = libfolder_plugin.la
+
+libtaglib_plugin_la_SOURCES = taglib.cpp ../demux/xiph_metadata.h ../demux/xiph_metadata.c
+libtaglib_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(TAGLIB_CFLAGS)
+libtaglib_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(metadir)'
+libtaglib_plugin_la_LIBADD = $(TAGLIB_LIBS) -lz
+EXTRA_LTLIBRARIES += libtaglib_plugin.la
+meta_LTLIBRARIES += $(LTLIBtaglib)
diff --git a/modules/meta_engine/Modules.am b/modules/meta_engine/Modules.am
deleted file mode 100644
index 89ea140..0000000
--- a/modules/meta_engine/Modules.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES_folder = folder.c
-SOURCES_taglib = taglib.cpp ../demux/xiph_metadata.h ../demux/xiph_metadata.c
-
-meta_engine_LTLIBRARIES += \
-	libfolder_plugin.la