refactor makefile

14 files changed, 19 insertions, 17 deletions

diff --git a/test/headless/headless.cpp b/test/headless/headless.cpp
index cd976be27d..20f5b5b3ae 100644
--- a/test/headless/headless.cpp
+++ b/test/headless/headless.cpp
@@ -12,7 +12,7 @@
 
 #include <mbgl/platform/default/headless_view.hpp>
 #include <mbgl/platform/default/headless_display.hpp>
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 #include <dirent.h>
 
diff --git a/test/storage/cache_response.cpp b/test/storage/cache_response.cpp
index 62aded7ca2..a0b5ba31c1 100644
--- a/test/storage/cache_response.cpp
+++ b/test/storage/cache_response.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/default/sqlite_cache.hpp>
 
 TEST_F(Storage, CacheResponse) {
diff --git a/test/storage/cache_revalidate.cpp b/test/storage/cache_revalidate.cpp
index 75df5822a5..530b7325b5 100644
--- a/test/storage/cache_revalidate.cpp
+++ b/test/storage/cache_revalidate.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/default/sqlite_cache.hpp>
 
 TEST_F(Storage, CacheRevalidate) {
diff --git a/test/storage/directory_reading.cpp b/test/storage/directory_reading.cpp
index 84221f3f21..bf472b5c79 100644
--- a/test/storage/directory_reading.cpp
+++ b/test/storage/directory_reading.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 TEST_F(Storage, ReadDirectory) {
     SCOPED_TEST(ReadDirectory)
diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp
index f7eea9c880..622eb2b8e8 100644
--- a/test/storage/file_reading.cpp
+++ b/test/storage/file_reading.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/platform/platform.hpp>
 
 TEST_F(Storage, EmptyFile) {
diff --git a/test/storage/http_cancel.cpp b/test/storage/http_cancel.cpp
index 0a5194d6e0..7e485ec42d 100644
--- a/test/storage/http_cancel.cpp
+++ b/test/storage/http_cancel.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/network_status.hpp>
 
 #include <cmath>
diff --git a/test/storage/http_coalescing.cpp b/test/storage/http_coalescing.cpp
index bfd9137ab3..592c65f8d6 100644
--- a/test/storage/http_coalescing.cpp
+++ b/test/storage/http_coalescing.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 TEST_F(Storage, HTTPCoalescing) {
     SCOPED_TEST(HTTPCoalescing)
diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp
index 101166780a..45c23b94b6 100644
--- a/test/storage/http_error.cpp
+++ b/test/storage/http_error.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/network_status.hpp>
 
 #include <cmath>
diff --git a/test/storage/http_header_parsing.cpp b/test/storage/http_header_parsing.cpp
index 2cecd78a49..655348c877 100644
--- a/test/storage/http_header_parsing.cpp
+++ b/test/storage/http_header_parsing.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 #include <cmath>
 
diff --git a/test/storage/http_load.cpp b/test/storage/http_load.cpp
index 73057f94f4..fff662da29 100644
--- a/test/storage/http_load.cpp
+++ b/test/storage/http_load.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 TEST_F(Storage, HTTPLoad) {
     SCOPED_TEST(HTTPLoad)
diff --git a/test/storage/http_noloop.cpp b/test/storage/http_noloop.cpp
index 673c8bf73e..c71fd0bc26 100644
--- a/test/storage/http_noloop.cpp
+++ b/test/storage/http_noloop.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/util/uv.hpp>
 
 TEST_F(Storage, HTTPNoLoop) {
diff --git a/test/storage/http_other_loop.cpp b/test/storage/http_other_loop.cpp
index 45990ac217..06cc6f7476 100644
--- a/test/storage/http_other_loop.cpp
+++ b/test/storage/http_other_loop.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 TEST_F(Storage, HTTPOtherLoop) {
     SCOPED_TEST(HTTPOtherLoop)
diff --git a/test/storage/http_reading.cpp b/test/storage/http_reading.cpp
index 3033a6f547..3aa57cd805 100644
--- a/test/storage/http_reading.cpp
+++ b/test/storage/http_reading.cpp
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include <mbgl/storage/default/default_file_source.hpp>
+#include <mbgl/storage/default_file_source.hpp>
 
 TEST_F(Storage, HTTPReading) {
     SCOPED_TEST(HTTPTest)
diff --git a/test/test.gyp b/test/test.gyp
index c6bf4d7520..547a2d099b 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -20,10 +20,12 @@
       'include_dirs': [ '../include', '../src' ],
       'dependencies': [
         'symlink_TEST_DATA',
-        '../mbgl.gyp:<(core_library)',
-        '../mbgl.gyp:<(platform_library)',
-        '../mbgl.gyp:<(storage_library)',
-        '../mbgl.gyp:<(headless_library)',
+        '../mbgl.gyp:core',
+        '../mbgl.gyp:platform-<(platform_lib)',
+        '../mbgl.gyp:http-<(http_lib)',
+        '../mbgl.gyp:asset-<(asset_lib)',
+        '../mbgl.gyp:cache-<(cache_lib)',
+        '../mbgl.gyp:headless-<(headless_lib)',
         '../deps/gtest/gtest.gyp:gtest'
       ],
       'sources': [