Port echonest info plugin to the new macro

src/infoplugins/generic/CMakeLists.txt

@@ -1,6 +1,4 @@
 
-add_subdirectory(echonest)
-
 list(APPEND simple_plugins
     Charts
     NewReleases
@@ -15,6 +13,13 @@ 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()
+
+
+include_directories(${LIBECHONEST_INCLUDE_DIR})
+add_tomahawk_plugin(echonest
+    TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO
+    SOURCES EchonestPlugin.cpp
+)
+

src/infoplugins/generic/echonest/CMakeLists.txt

@@ -1,45 +0,0 @@
-project( tomahawk )
-
-include( ${QT_USE_FILE} )
-add_definitions( ${QT_DEFINITIONS} )
-add_definitions( -DQT_PLUGIN )
-add_definitions( -DQT_SHARED )
-add_definitions( -DINFOPLUGINDLLEXPORT_PRO )
-
-set( echonestInfoPluginSources
-    EchonestPlugin.cpp
-)
-
-set( echonestInfoPluginHeaders
-    EchonestPlugin.h
-)
-
-include_directories(
-   ${QT_INCLUDE_DIR}
-   ${LIBECHONEST_INCLUDE_DIR}
-)
-
-qt4_wrap_cpp( echonestInfoPluginMoc ${echonestInfoPluginHeaders} )
-add_library( tomahawk_infoplugin_echonest SHARED ${echonestInfoPluginSources} ${echonestInfoPluginMoc} ${RC_SRCS} )
-
-IF( WIN32 )
-SET( OS_SPECIFIC_LINK_LIBRARIES
-        ${OS_SPECIFIC_LINK_LIBRARIES}
-        "winmm.dll"
-        "iphlpapi.a"
-)
-ENDIF( WIN32 )
-
-target_link_libraries( tomahawk_infoplugin_echonest
-    ${TOMAHAWK_LIBRARIES}
-    ${LIBECHONEST_LIBRARY}
-    ${QT_LIBRARIES}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-)
-
-IF( APPLE )
-#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
-ENDIF( APPLE )
-
-install( TARGETS tomahawk_infoplugin_echonest DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-

src/libtomahawk/infosystem/InfoSystemWorker.cpp

@@ -27,7 +27,7 @@
 #include "HeadlessCheck.h"
 #include "InfoSystemWorker.h"
 #include "InfoSystemCache.h"
-#include "infoplugins/generic/echonest/EchonestPlugin.h"
+#include "infoplugins/generic/EchonestPlugin.h"
 #include "infoplugins/generic/MusixMatchPlugin.h"
 #include "infoplugins/generic/ChartsPlugin.h"
 #include "infoplugins/generic/NewReleasesPlugin.h"