Only require fastos where you actually use it and link statically

12 files changed, 14 insertions, 13 deletions

diff --git a/fbench/src/fbench/CMakeLists.txt b/fbench/src/fbench/CMakeLists.txt
index f9f2ad7e1d9..987d128f66b 100644
--- a/fbench/src/fbench/CMakeLists.txt
+++ b/fbench/src/fbench/CMakeLists.txt
@@ -7,5 +7,5 @@ vespa_add_executable(fbench_app
     INSTALL bin
     DEPENDS
     fbench_util
-    fastos
+    fbench_httpclient
 )
diff --git a/fbench/src/fbench/client.cpp b/fbench/src/fbench/client.cpp
index efaafab6e87..912589a1fed 100644
--- a/fbench/src/fbench/client.cpp
+++ b/fbench/src/fbench/client.cpp
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <util/timer.h>
-#include <util/httpclient.h>
+#include <httpclient/httpclient.h>
 #include <util/filereader.h>
 #include "client.h"
 
diff --git a/fbench/src/fbench/fbench.cpp b/fbench/src/fbench/fbench.cpp
index 5e53573b1b3..14a0fd4106d 100644
--- a/fbench/src/fbench/fbench.cpp
+++ b/fbench/src/fbench/fbench.cpp
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <util/timer.h>
-#include <util/httpclient.h>
+#include <httpclient/httpclient.h>
 #include <util/filereader.h>
 #include "client.h"
 #include "fbench.h"
diff --git a/fbench/src/fbench/fbench.h b/fbench/src/fbench/fbench.h
index cf0782f9e36..636d2b7e8b7 100644
--- a/fbench/src/fbench/fbench.h
+++ b/fbench/src/fbench/fbench.h
@@ -67,8 +67,4 @@ public:
     int Main(int argc, char *argv[]);
 };
 
-/**
- * Run fbench as a FastOS application.
- **/
 int main(int argc, char** argv);
-
diff --git a/fbench/src/geturl/CMakeLists.txt b/fbench/src/geturl/CMakeLists.txt
index c5e69018e5d..d9163146dc1 100644
--- a/fbench/src/geturl/CMakeLists.txt
+++ b/fbench/src/geturl/CMakeLists.txt
@@ -6,5 +6,5 @@ vespa_add_executable(fbench_geturl_app
     INSTALL bin
     DEPENDS
     fbench_util
-    fastos
+    fbench_httpclient
 )
diff --git a/fbench/src/geturl/geturl.cpp b/fbench/src/geturl/geturl.cpp
index 667db264156..5a8b25ec7f5 100644
--- a/fbench/src/geturl/geturl.cpp
+++ b/fbench/src/geturl/geturl.cpp
@@ -1,5 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <util/httpclient.h>
+#include <httpclient/httpclient.h>
 #include <iostream>
 
 int
diff --git a/fbench/src/httpclient/CMakeLists.txt b/fbench/src/httpclient/CMakeLists.txt
new file mode 100644
index 00000000000..25140e02b57
--- /dev/null
+++ b/fbench/src/httpclient/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(fbench_httpclient STATIC
+    SOURCES
+    httpclient.cpp
+    DEPENDS
+    fastos_static
+)
diff --git a/fbench/src/util/httpclient.cpp b/fbench/src/httpclient/httpclient.cpp
index ce2157335e4..ce2157335e4 100644
--- a/fbench/src/util/httpclient.cpp
+++ b/fbench/src/httpclient/httpclient.cpp
diff --git a/fbench/src/util/httpclient.h b/fbench/src/httpclient/httpclient.h
index e69a10346cd..e69a10346cd 100644
--- a/fbench/src/util/httpclient.h
+++ b/fbench/src/httpclient/httpclient.h
diff --git a/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt
index 23a95df9dff..69214361825 100644
--- a/fbench/src/test/CMakeLists.txt
+++ b/fbench/src/test/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_executable(fbench_httpclient_splitstring_app TEST
     httpclient_splitstring.cpp
     DEPENDS
     fbench_util
-    fastos
 )
 vespa_add_test(NAME fbench_httpclient_splitstring_app COMMAND fbench_httpclient_splitstring_app)
 vespa_add_executable(fbench_httpclient_app
@@ -12,7 +11,7 @@ vespa_add_executable(fbench_httpclient_app
     httpclient.cpp
     DEPENDS
     fbench_util
-    fastos
+    fbench_httpclient
 )
 vespa_add_executable(fbench_filereader_app TEST
     SOURCES
diff --git a/fbench/src/test/httpclient.cpp b/fbench/src/test/httpclient.cpp
index 9c1800d0003..afa1419a018 100644
--- a/fbench/src/test/httpclient.cpp
+++ b/fbench/src/test/httpclient.cpp
@@ -1,5 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <util/httpclient.h>
+#include <httpclient/httpclient.h>
 #include <iostream>
 #include <thread>
 
diff --git a/fbench/src/util/CMakeLists.txt b/fbench/src/util/CMakeLists.txt
index 9efca452cea..74c6666bee1 100644
--- a/fbench/src/util/CMakeLists.txt
+++ b/fbench/src/util/CMakeLists.txt
@@ -2,7 +2,6 @@
 vespa_add_library(fbench_util STATIC
     SOURCES
     filereader.cpp
-    httpclient.cpp
     timer.cpp
     clientstatus.cpp
     DEPENDS