meta_engine: remove makefile recursion (refs #9367)

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

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
 

modules/meta_engine/Makefile.am

-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