[Amarok] eb778af Fix hang-on-exit.

[Jeff Mitchell]

	A	 src/core/support/Debug.cpp	 [License: Trivialfile.]

commit eb778afdad88aa8f82ac843974115ff6572cdd79
Author: Jeff Mitchell <mitchell at kde.org>
Date:   Thu Apr 22 06:48:09 2010 -0400

    Fix hang-on-exit.
    
    CCMAIL:amarok-devel at kde.org

diff --git a/shared/Debug.cpp b/shared/Debug.cpp
deleted file mode 100644
index b08d547..0000000
--- a/shared/Debug.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <QMutex> 
-#include "core/support/Debug.h"
-
-QMutex Debug::mutex;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3ac4e5d..c38c8d1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -586,7 +586,6 @@ set(amaroklib_LIB_SRCS
     ${libamarokurl_SRCS}
     ${taglib_filetype_resolver_SRCS}
     ${libsynchronization_SRCS}
-    ../shared/Debug.cpp
     core-impl/logger/ProxyLogger.cpp
     aboutdialog/AnimatedBarWidget.cpp
     aboutdialog/AnimatedWidget.cpp
diff --git a/src/context/containments/verticallayout/CMakeLists.txt b/src/context/containments/verticallayout/CMakeLists.txt
index 097e4dc..4bdde31 100644
--- a/src/context/containments/verticallayout/CMakeLists.txt
+++ b/src/context/containments/verticallayout/CMakeLists.txt
@@ -15,7 +15,7 @@ kde4_add_plugin(amarok_containment_vertical ${context_SRCS})
 if(APPLE)
    SET_TARGET_PROPERTIES(amarok_containment_vertical PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
 endif(APPLE)
-target_link_libraries(amarok_containment_vertical amaroklib ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(amarok_containment_vertical amarokcore amaroklib ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
 
 install(TARGETS amarok_containment_vertical DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES amarok-containment-vertical.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index e398d88..5863ca1 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -73,7 +73,7 @@ set(libcore_support_SRCS
     support/Amarok.cpp
     support/Components.cpp
     support/SmartPointerList.cpp
-    ../../shared/Debug.cpp
+    support/Debug.cpp
 )
 
 set(libcore_engine_SRCS
diff --git a/src/core/support/Debug.cpp b/src/core/support/Debug.cpp
new file mode 100644
index 0000000..a5bc9eb
--- /dev/null
+++ b/src/core/support/Debug.cpp
@@ -0,0 +1,5 @@
+#include <QMutex> 
+#include "core/support/Debug.h"
+#include "shared/amarok_export.h"
+
+AMAROK_EXPORT QMutex Debug::mutex;
diff --git a/tests/synchronization/CMakeLists.txt b/tests/synchronization/CMakeLists.txt
index 5bc06ca..880586a 100644
--- a/tests/synchronization/CMakeLists.txt
+++ b/tests/synchronization/CMakeLists.txt
@@ -32,10 +32,12 @@ set( testmasterslave_SRCS
     )
 
 kde4_add_unit_test( testmasterslavesynchronizationjob  ${testmasterslave_SRCS} )
-add_dependencies( testmasterslavesynchronizationjob amaroklib )
 
+add_dependencies( testmasterslavesynchronizationjob amarokcore )
+add_dependencies( testmasterslavesynchronizationjob amaroklib )
 
 target_link_libraries(testmasterslavesynchronizationjob
+                        amarokcore
                         amaroklib
                         ${KDE4_KDECORE_LIBS}
                         ${KDE4_KDEUI_LIBS}
@@ -68,9 +70,11 @@ set( testunion_SRCS
     )
 
 kde4_add_unit_test( testunionjob  ${testunion_SRCS} )
+add_dependencies( testunionjob amarokcore )
 add_dependencies( testunionjob amaroklib )
 
 target_link_libraries(testunionjob
+                        amarokcore
                         amaroklib
                         ${KDE4_KDECORE_LIBS}
                         ${KDE4_KDEUI_LIBS}
@@ -103,9 +107,11 @@ set( testonewaysynchronization_SRCS
     )
 
 kde4_add_unit_test( testonewaysynchronizationjob  ${testonewaysynchronization_SRCS} )
+add_dependencies( testonewaysynchronizationjob amarokcore )
 add_dependencies( testonewaysynchronizationjob amaroklib )
 
 target_link_libraries(testonewaysynchronizationjob
+                        amarokcore
                         amaroklib
                         ${KDE4_KDECORE_LIBS}
                         ${KDE4_KDEUI_LIBS}