Make generic infoplugins real plugins

src/infoplugins/generic/CMakeLists.txt

@@ -1 +1,20 @@
-ADD_SUBDIRECTORY( echonest )
+
+add_subdirectory(echonest)
+
+list(APPEND simple_plugins
+    Charts
+    NewReleases
+    spotify
+    hypem
+    MusixMatch
+    musicbrainz
+    Rovi
+)
+
+foreach(simple_plugin ${simple_plugins})
+    add_tomahawk_plugin(${simple_plugin}
+        TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO
+        SOURCES "${simple_plugin}Plugin.cpp"
+        LINK_LIBRARIES ${TOMAHAWK_LIBRARIES}
+    )
+endforeach()

src/libtomahawk/CMakeLists.txt

@@ -254,14 +254,6 @@ set( libSources
     infosystem/InfoSystemCache.cpp
     infosystem/InfoSystemWorker.cpp
 
-    infosystem/infoplugins/generic/ChartsPlugin.cpp
-    infosystem/infoplugins/generic/NewReleasesPlugin.cpp
-    infosystem/infoplugins/generic/spotifyPlugin.cpp
-    infosystem/infoplugins/generic/hypemPlugin.cpp
-    infosystem/infoplugins/generic/MusixMatchPlugin.cpp
-    infosystem/infoplugins/generic/musicbrainzPlugin.cpp
-    infosystem/infoplugins/generic/RoviPlugin.cpp
-
     network/BufferIoDevice.cpp
     network/MsgProcessor.cpp
     network/StreamConnection.cpp

src/libtomahawk/infosystem/InfoSystemWorker.cpp

@@ -88,13 +88,13 @@ InfoSystemWorker::init( Tomahawk::InfoSystem::InfoSystemCache* cache )
     loadInfoPlugins( findInfoPlugins() );
 
 #ifndef ENABLE_HEADLESS
-    addInfoPlugin( InfoPluginPtr( new MusixMatchPlugin() ) );
-    addInfoPlugin( InfoPluginPtr( new MusicBrainzPlugin() ) );
-    addInfoPlugin( InfoPluginPtr( new ChartsPlugin() ) );
-    addInfoPlugin( InfoPluginPtr( new NewReleasesPlugin() ) );
-    addInfoPlugin( InfoPluginPtr( new RoviPlugin() ) );
-    addInfoPlugin( InfoPluginPtr( new SpotifyPlugin() ) );
-    addInfoPlugin( InfoPluginPtr( new hypemPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new MusixMatchPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new MusicBrainzPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new ChartsPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new NewReleasesPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new RoviPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new SpotifyPlugin() ) );
+//     addInfoPlugin( InfoPluginPtr( new hypemPlugin() ) );
 #endif
 
 #ifdef Q_WS_MAC