meta_engine: remove makefile recursion (refs #9367)

diff --git a/configure.ac b/configure.ac
index a7df70e6216df12766fdea4e1dfcdf13f2f9bdf3..44700e9854d0684198e5b484dd92985a2bc88659 100644 (file)
--- 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 a589972f7072c98e926ece5a5f564fea38357829..428002d67d5f4c62875dab56fd47df8f7681f04b 100644 (file)
--- 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 efa32f195b58375e4e20c88db53bdd91b0109f9b..003d292cdc9a80762a6515e0ced77552f13b5120 100644 (file)
--- 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