Adapt makefiles, includes etc. to new locations.

11 files changed, 22 insertions, 21 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index fec8969284..e18d3db973 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -9,7 +9,8 @@ check_PROGRAMS = test
 
 noinst_PROGRAMS = test unittest
 
-AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\"
+AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\" \
+	-I${top_srcdir}/common -I${top_srcdir}/wsd -I${top_srcdir}/kit
 
 noinst_LTLIBRARIES = \
         unit-timeout.la unit-prefork.la \
@@ -29,15 +30,15 @@ AM_CPPFLAGS = -pthread -I$(top_srcdir) -DBUILDING_TESTS
 wsd_sources = \
             ../common/FileUtil.cpp \
             ../common/SigUtil.cpp \
-            ../IoUtil.cpp \
-            ../Log.cpp \
-            ../LOOLKit.cpp \
-            ../LOOLProtocol.cpp \
-            ../LOOLSession.cpp \
-            ../TileCache.cpp \
-            ../MessageQueue.cpp \
-            ../Unit.cpp \
-            ../Util.cpp
+            ../common/IoUtil.cpp \
+            ../common/Log.cpp \
+            ../common/Protocol.cpp \
+            ../common/Session.cpp \
+	    ../common/MessageQueue.cpp \
+            ../kit/Kit.cpp \
+            ../wsd/TileCache.cpp \
+            ../common/Unit.cpp \
+            ../common/Util.cpp
 
 test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 test_SOURCES = TileCacheTests.cpp integration-http-server.cpp \
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index e391526acc..64780a6aa2 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -12,7 +12,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include <LOOLWebSocket.hpp>
 #include "MessageQueue.hpp"
 #include "Png.hpp"
diff --git a/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
index 964df48c20..dea692baa3 100644
--- a/test/TileQueueTests.cpp
+++ b/test/TileQueueTests.cpp
@@ -12,7 +12,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include "MessageQueue.hpp"
 #include "Util.hpp"
 
diff --git a/test/UnitFonts.cpp b/test/UnitFonts.cpp
index 60312d45d0..265d5b223a 100644
--- a/test/UnitFonts.cpp
+++ b/test/UnitFonts.cpp
@@ -20,7 +20,7 @@
 #include <Poco/Timestamp.h>
 
 #include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include "Log.hpp"
 #include "Unit.hpp"
 #include "Util.hpp"
diff --git a/test/UnitFuzz.cpp b/test/UnitFuzz.cpp
index 7454aa499d..fba1d73480 100644
--- a/test/UnitFuzz.cpp
+++ b/test/UnitFuzz.cpp
@@ -16,7 +16,7 @@
 
 #include "Common.hpp"
 #include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include <LOOLWebSocket.hpp>
 #include "Unit.hpp"
 #include "Util.hpp"
diff --git a/test/UnitPrefork.cpp b/test/UnitPrefork.cpp
index 9f5463b992..93d4adb61b 100644
--- a/test/UnitPrefork.cpp
+++ b/test/UnitPrefork.cpp
@@ -24,7 +24,7 @@
 
 #include "Common.hpp"
 #include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include <LOOLWebSocket.hpp>
 #include "Log.hpp"
 #include "Unit.hpp"
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index 2224619ba7..6ca75bcbb8 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -13,8 +13,8 @@
 
 #include <ChildSession.hpp>
 #include <Common.hpp>
-#include <LOOLKit.hpp>
-#include <LOOLProtocol.hpp>
+#include <Kit.hpp>
+#include <Protocol.hpp>
 #include <MessageQueue.hpp>
 #include <Util.hpp>
 
diff --git a/test/helpers.hpp b/test/helpers.hpp
index 30aeac1272..a10cc53540 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -41,7 +41,7 @@
 
 #include <Common.hpp>
 #include "common/FileUtil.hpp"
-#include <LOOLProtocol.hpp>
+#include <Protocol.hpp>
 #include <LOOLWebSocket.hpp>
 #include <UserMessages.hpp>
 #include <Util.hpp>
diff --git a/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
index 1bfd4f28f3..a4a4ff3b2a 100644
--- a/test/httpcrashtest.cpp
+++ b/test/httpcrashtest.cpp
@@ -40,7 +40,7 @@
 #include <Common.hpp>
 #include <UserMessages.hpp>
 #include <Util.hpp>
-#include <LOOLProtocol.hpp>
+#include <Protocol.hpp>
 #include <LOOLWebSocket.hpp>
 #include "helpers.hpp"
 #include "countloolkits.hpp"
diff --git a/test/httpwserror.cpp b/test/httpwserror.cpp
index 0bd8b6579b..67fd2351ef 100644
--- a/test/httpwserror.cpp
+++ b/test/httpwserror.cpp
@@ -22,7 +22,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include <LOOLWebSocket.hpp>
 #include "helpers.hpp"
 #include "countloolkits.hpp"
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 1e65fc2f0c..d180820100 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -40,7 +40,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
 #include <LOOLWebSocket.hpp>
 #include "Png.hpp"
 #include "UserMessages.hpp"