summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-06 12:15:55 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-06 12:15:55 -0500
commitd9227036c7b8878625c46402065ecd6b2c1e67d6 (patch)
treef894a3a7e8987d10ae4504fe3db43813b2ee2550
parent77a1b11d205e55a99a6a507e6faf3e5baf70faf6 (diff)
parentaaf2ebb548031a91bd353fd9561b928f877d404a (diff)
downloadtdebase-d9227036c7b8878625c46402065ecd6b2c1e67d6.tar.gz
tdebase-d9227036c7b8878625c46402065ecd6b2c1e67d6.zip
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase
-rw-r--r--kicker/applets/launcher/CMakeLists.txt2
-rw-r--r--kicker/applets/systemtray/CMakeLists.txt2
-rw-r--r--kicker/kicker/buttons/CMakeLists.txt2
-rw-r--r--kicker/kicker/core/CMakeLists.txt2
-rw-r--r--kicker/kicker/ui/CMakeLists.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index 7a81b31f7..15bb0b12a 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_kpart( launcher_panelapplet AUTOMOC
kicker_core-static kicker_buttons-static kicker_ui-static
-Wl,--end-group
kickermain-shared tdeutils-shared tdeabc-shared
- DEPENDENCIES libkicker-shared
+ DEPENDENCIES kickermain-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kicker/applets/systemtray/CMakeLists.txt b/kicker/applets/systemtray/CMakeLists.txt
index ee1ea0436..904c977b7 100644
--- a/kicker/applets/systemtray/CMakeLists.txt
+++ b/kicker/applets/systemtray/CMakeLists.txt
@@ -42,5 +42,5 @@ tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kickermain-shared clock_panelapplet-static
DESTINATION ${PLUGIN_INSTALL_DIR}
- DEPENDENCIES kicker_core-static kicker-static kicker-shared clock_panelapplet-static
+ DEPENDENCIES kicker_core-static clock_panelapplet-static
)
diff --git a/kicker/kicker/buttons/CMakeLists.txt b/kicker/kicker/buttons/CMakeLists.txt
index 72d9254c3..9479ed1b4 100644
--- a/kicker/kicker/buttons/CMakeLists.txt
+++ b/kicker/kicker/buttons/CMakeLists.txt
@@ -48,5 +48,5 @@ set( ${target}_SRCS
tde_add_library( ${target} STATIC_PIC AUTOMOC
SOURCES ${${target}_SRCS}
- DEPENDENCIES kicker_core-static kicker-static kicker-shared
+ DEPENDENCIES kicker_core-static
)
diff --git a/kicker/kicker/core/CMakeLists.txt b/kicker/kicker/core/CMakeLists.txt
index fdef6dc5f..3722f75d3 100644
--- a/kicker/kicker/core/CMakeLists.txt
+++ b/kicker/kicker/core/CMakeLists.txt
@@ -49,6 +49,6 @@ set( ${target}_SRCS
tde_add_library( ${target} STATIC_PIC AUTOMOC
SOURCES ${${target}_SRCS}
- DEPENDENCIES libkicker-shared
+ DEPENDENCIES kickermain-shared
LINK konq-shared
)
diff --git a/kicker/kicker/ui/CMakeLists.txt b/kicker/kicker/ui/CMakeLists.txt
index f65c51802..e1fdfd957 100644
--- a/kicker/kicker/ui/CMakeLists.txt
+++ b/kicker/kicker/ui/CMakeLists.txt
@@ -55,6 +55,6 @@ set( ${target}_SRCS
tde_add_library( ${target} STATIC_PIC AUTOMOC
SOURCES ${${target}_SRCS}
- DEPENDENCIES kicker_core-static kickermain-static
+ DEPENDENCIES kicker_core-static
LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES}
)