[vlc-commits] meta_engine: remove makefile recursion (refs #9367)

[Rémi Denis-Courmont]

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

meta_engine: remove makefile recursion (refs #9367)

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

 configure.ac                    |    1 -
 modules/Makefile.am             |    2 +-
 modules/meta_engine/Makefile.am |    7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7df70e..44700e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4225,7 +4225,6 @@ AC_CONFIG_FILES([
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
   modules/lua/Makefile
-  modules/meta_engine/Makefile
   modules/misc/Makefile
   modules/mux/Makefile
   modules/notify/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index a589972..428002d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -8,7 +8,6 @@ BASE_SUBDIRS = \
 	audio_output \
 	control \
 	gui \
-	meta_engine \
 	misc \
 	notify \
 	packetizer \
@@ -59,6 +58,7 @@ include common.am
 include access/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am
+include meta_engine/Makefile.am
 
 BUILT_SOURCES += dummy.cpp
 
diff --git a/modules/meta_engine/Makefile.am b/modules/meta_engine/Makefile.am
index efa32f1..003d292 100644
--- a/modules/meta_engine/Makefile.am
+++ b/modules/meta_engine/Makefile.am
@@ -1,11 +1,10 @@
-include ../common.am
 metadir = $(pluginsdir)/meta_engine
-EXTRA_LTLIBRARIES =
 
-libfolder_plugin_la_SOURCES = folder.c
+libfolder_plugin_la_SOURCES = meta_engine/folder.c
 meta_LTLIBRARIES = libfolder_plugin.la
 
-libtaglib_plugin_la_SOURCES = taglib.cpp ../demux/xiph_metadata.h ../demux/xiph_metadata.c
+libtaglib_plugin_la_SOURCES = meta_engine/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