simplify slobrok dependencies (#214)

* the slobrokserver library needs classes from the slobrok
  client / utility library.  Modules that just want the server
  shouldn't need to worry about that explicitly.

8 files changed, 1 insertions, 7 deletions

diff --git a/slobrok/src/apps/slobrok/CMakeLists.txt b/slobrok/src/apps/slobrok/CMakeLists.txt
index 1a735a366e4..edb3976b74e 100644
--- a/slobrok/src/apps/slobrok/CMakeLists.txt
+++ b/slobrok/src/apps/slobrok/CMakeLists.txt
@@ -6,5 +6,4 @@ vespa_add_executable(slobrok_app
     INSTALL bin
     DEPENDS
     slobrok_slobrokserver
-    slobrok
 )
diff --git a/slobrok/src/tests/backoff/CMakeLists.txt b/slobrok/src/tests/backoff/CMakeLists.txt
index b64b9f36cba..60ec9071f4e 100644
--- a/slobrok/src/tests/backoff/CMakeLists.txt
+++ b/slobrok/src/tests/backoff/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(slobrok_backoff_test_app TEST
     SOURCES
     testbackoff.cpp
     DEPENDS
-    slobrok
     slobrok_slobrokserver
 )
 vespa_add_test(NAME slobrok_backoff_test_app COMMAND slobrok_backoff_test_app)
diff --git a/slobrok/src/tests/configure/CMakeLists.txt b/slobrok/src/tests/configure/CMakeLists.txt
index 93718d305b3..86c310c5338 100644
--- a/slobrok/src/tests/configure/CMakeLists.txt
+++ b/slobrok/src/tests/configure/CMakeLists.txt
@@ -8,7 +8,6 @@ vespa_add_executable(slobrok_configure_test_app TEST
     SOURCES
     configure.cpp
     DEPENDS
-    slobrok
     slobrok_slobrokserver
 )
 vespa_add_test(
diff --git a/slobrok/src/tests/mirrorapi/CMakeLists.txt b/slobrok/src/tests/mirrorapi/CMakeLists.txt
index 62b1d32eac7..567d1398dbe 100644
--- a/slobrok/src/tests/mirrorapi/CMakeLists.txt
+++ b/slobrok/src/tests/mirrorapi/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(slobrok_mirrorapi_test_app TEST
     SOURCES
     mirrorapi.cpp
     DEPENDS
-    slobrok
     slobrok_slobrokserver
 )
 vespa_add_test(NAME slobrok_mirrorapi_test_app COMMAND slobrok_mirrorapi_test_app)
diff --git a/slobrok/src/tests/oldapi/CMakeLists.txt b/slobrok/src/tests/oldapi/CMakeLists.txt
index 0616e0e0696..29ec01930ce 100644
--- a/slobrok/src/tests/oldapi/CMakeLists.txt
+++ b/slobrok/src/tests/oldapi/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_executable(slobrok_oldapi_test_app TEST
     old.cpp
     mirror.cpp
     DEPENDS
-    slobrok
     slobrok_slobrokserver
 )
 vespa_add_test(NAME slobrok_oldapi_test_app COMMAND slobrok_oldapi_test_app)
diff --git a/slobrok/src/tests/registerapi/CMakeLists.txt b/slobrok/src/tests/registerapi/CMakeLists.txt
index 366a5adda78..60b7d19b7f5 100644
--- a/slobrok/src/tests/registerapi/CMakeLists.txt
+++ b/slobrok/src/tests/registerapi/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(slobrok_registerapi_test_app TEST
     SOURCES
     registerapi.cpp
     DEPENDS
-    slobrok
     slobrok_slobrokserver
 )
 vespa_add_test(NAME slobrok_registerapi_test_app COMMAND slobrok_registerapi_test_app)
diff --git a/slobrok/src/tests/standalone/CMakeLists.txt b/slobrok/src/tests/standalone/CMakeLists.txt
index ce9517a67af..faed1f17c02 100644
--- a/slobrok/src/tests/standalone/CMakeLists.txt
+++ b/slobrok/src/tests/standalone/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(slobrok_standalone_test_app TEST
     standalone.cpp
     DEPENDS
     slobrok_slobrokserver
-    slobrok
 )
 vespa_add_test(NAME slobrok_standalone_test_app COMMAND slobrok_standalone_test_app)
diff --git a/slobrok/src/vespa/slobrok/server/CMakeLists.txt b/slobrok/src/vespa/slobrok/server/CMakeLists.txt
index d20f6850518..da337624ce3 100644
--- a/slobrok/src/vespa/slobrok/server/CMakeLists.txt
+++ b/slobrok/src/vespa/slobrok/server/CMakeLists.txt
@@ -23,4 +23,5 @@ vespa_add_library(slobrok_slobrokserver
     metrics_producer.cpp
     INSTALL lib64
     DEPENDS
+    slobrok
 )