split away util, logger, and module

made a liblogger
adapted all tests

56 files changed, 215 insertions, 38 deletions

diff --git a/src/ConsoleLogSink.hpp b/include/logger/ConsoleLogSink.hpp
index f700825..f700825 100755
--- a/src/ConsoleLogSink.hpp
+++ b/include/logger/ConsoleLogSink.hpp
diff --git a/src/FileLogSink.hpp b/include/logger/FileLogSink.hpp
index f488a87..f488a87 100755
--- a/src/FileLogSink.hpp
+++ b/include/logger/FileLogSink.hpp
diff --git a/src/LogSink.hpp b/include/logger/LogSink.hpp
index 322e546..322e546 100755
--- a/src/LogSink.hpp
+++ b/include/logger/LogSink.hpp
diff --git a/src/Logger.hpp b/include/logger/Logger.hpp
index dc514ae..dc514ae 100755
--- a/src/Logger.hpp
+++ b/include/logger/Logger.hpp
diff --git a/src/SyslogLogSink.hpp b/include/logger/SyslogLogSink.hpp
index 64e52f1..64e52f1 100755
--- a/src/SyslogLogSink.hpp
+++ b/include/logger/SyslogLogSink.hpp
diff --git a/src/WinDbgLogSink.hpp b/include/logger/WinDbgLogSink.hpp
index f7caa86..f7caa86 100755
--- a/src/WinDbgLogSink.hpp
+++ b/include/logger/WinDbgLogSink.hpp
diff --git a/src/ModuleLoader.hpp b/include/module/ModuleLoader.hpp
index a5416bb..a5416bb 100755
--- a/src/ModuleLoader.hpp
+++ b/include/module/ModuleLoader.hpp
diff --git a/src/ModuleRegistry.hpp b/include/module/ModuleRegistry.hpp
index e217092..e217092 100755
--- a/src/ModuleRegistry.hpp
+++ b/include/module/ModuleRegistry.hpp
diff --git a/src/Exportable.hpp b/include/util/Exportable.hpp
index 28ac7ff..28ac7ff 100644
--- a/src/Exportable.hpp
+++ b/include/util/Exportable.hpp
diff --git a/src/NonCopyable.hpp b/include/util/NonCopyable.hpp
index 44d1a93..44d1a93 100755
--- a/src/NonCopyable.hpp
+++ b/include/util/NonCopyable.hpp
diff --git a/src/Noreturn.hpp b/include/util/Noreturn.hpp
index 9f9862c..9f9862c 100644
--- a/src/Noreturn.hpp
+++ b/include/util/Noreturn.hpp
diff --git a/src/ScopedPtr.hpp b/include/util/ScopedPtr.hpp
index 19a41d2..19a41d2 100644
--- a/src/ScopedPtr.hpp
+++ b/include/util/ScopedPtr.hpp
diff --git a/src/Singleton.hpp b/include/util/Singleton.hpp
index 1bfb460..1bfb460 100755
--- a/src/Singleton.hpp
+++ b/include/util/Singleton.hpp
diff --git a/src/TypeDetect.hpp b/include/util/TypeDetect.hpp
index 7db714b..7db714b 100644
--- a/src/TypeDetect.hpp
+++ b/include/util/TypeDetect.hpp
diff --git a/src/TypeInfo.hpp b/include/util/TypeInfo.hpp
index 3ca4b57..3ca4b57 100755
--- a/src/TypeInfo.hpp
+++ b/include/util/TypeInfo.hpp
diff --git a/src/TypeList.hpp b/include/util/TypeList.hpp
index bc8c49b..bc8c49b 100644
--- a/src/TypeList.hpp
+++ b/include/util/TypeList.hpp
diff --git a/src/TypeTraits.hpp b/include/util/TypeTraits.hpp
index b01051e..b01051e 100644
--- a/src/TypeTraits.hpp
+++ b/include/util/TypeTraits.hpp
diff --git a/src/GNUmakefile b/src/GNUmakefile
index d44dd97..97b934a 100755
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -1,17 +1,23 @@
 TOPDIR = ..
 
-SUBDIRS = modules
+SUBDIRS = logger modules
 
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_CPPFLAGS = \
 
-INCLUDE_LDFLAGS = \
 
 INCLUDE_DIRS = \
-	-I.
+	-I. \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
+
+INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src/logger
 
 INCLUDE_LIBS = \
+	-llogger
 
 # openssl
 ifeq ($(WITH_SSL),1)
@@ -31,10 +37,6 @@ DYNAMIC_LIB_MINOR = 0
 DYNAMIC_LIB_PATCH = 0
 
 CPP_OBJS = \
-	Logger.o \
-	ConsoleLogSink.o \
-	FileLogSink.o \
-	SyslogLogSink.o \
 	URL.o \
 	MIMEType.o \
 	SpoolRewindInputStream.o
@@ -64,4 +66,4 @@ local_uninstall:
 local_test:
 
 run:
-	@LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./crawl
+	@LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./crawl
diff --git a/src/Makefile.W32 b/src/Makefile.W32
index 7426c18..604b8c4 100755
--- a/src/Makefile.W32
+++ b/src/Makefile.W32
@@ -1,6 +1,6 @@
 TOPDIR = ..
 
-SUBDIRS = modules
+SUBDIRS = logger modules
 
 !INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk
 
@@ -18,12 +18,6 @@ INCLUDE_LIBS = \
 LOCAL_STATIC_LIB_OBJS = \
 	win32\errormsg.obj \
 	win32\stringutils.obj \
-	win32\syslog_win32.obj \
-	Logger.obj \
-	ConsoleLogSink.obj \
-	FileLogSink.obj \
-	SyslogLogSink.obj \
-	WinDbgLogSink.obj \
 	URL.obj \
 	MIMEType.obj \
 	SpoolRewindInputStream.obj
diff --git a/src/ConsoleLogSink.cpp b/src/logger/ConsoleLogSink.cpp
index 84a1ebd..84a1ebd 100755
--- a/src/ConsoleLogSink.cpp
+++ b/src/logger/ConsoleLogSink.cpp
diff --git a/src/FileLogSink.cpp b/src/logger/FileLogSink.cpp
index d812dbe..d812dbe 100644
--- a/src/FileLogSink.cpp
+++ b/src/logger/FileLogSink.cpp
diff --git a/src/logger/GNUmakefile b/src/logger/GNUmakefile
new file mode 100755
index 0000000..7993f7d
--- /dev/null
+++ b/src/logger/GNUmakefile
@@ -0,0 +1,43 @@
+TOPDIR = ../..
+
+SUBDIRS =
+
+-include $(TOPDIR)/makefiles/gmake/platform.mk
+
+INCLUDE_CPPFLAGS = \
+
+INCLUDE_LDFLAGS = \
+
+INCLUDE_DIRS = \
+	-I. \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util
+
+INCLUDE_LIBS = \
+
+STATIC_LIB = liblogger.a
+
+DYNAMIC_LIB = liblogger.so
+DYNAMIC_LIB_MAJOR = 0
+DYNAMIC_LIB_MINOR = 0
+DYNAMIC_LIB_PATCH = 0
+
+CPP_OBJS = \
+	Logger.o \
+	ConsoleLogSink.o \
+	FileLogSink.o \
+	SyslogLogSink.o
+
+-include $(TOPDIR)/makefiles/gmake/sub.mk
+
+local_all:
+
+local_clean:
+
+local_distclean:
+
+local_install:
+
+local_uninstall:
+
+local_test:
diff --git a/src/Logger.cpp b/src/logger/Logger.cpp
index c4d44d8..c4d44d8 100755
--- a/src/Logger.cpp
+++ b/src/logger/Logger.cpp
diff --git a/src/logger/Makefile.W32 b/src/logger/Makefile.W32
new file mode 100755
index 0000000..ea2e6fc
--- /dev/null
+++ b/src/logger/Makefile.W32
@@ -0,0 +1,63 @@
+TOPDIR = ..
+
+SUBDIRS =
+
+!INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk
+
+INCLUDE_CXXFLAGS = \
+	/D_WIN32_WINNT=0x504
+
+INCLUDE_DIRS = \
+	/I.
+
+INCLUDE_LDFLAGS = \
+
+INCLUDE_LIBS = \
+	Ws2_32.lib
+
+LOCAL_STATIC_LIB_OBJS = \
+	win32\errormsg.obj \
+	win32\stringutils.obj \
+	win32\syslog_win32.obj \
+	Logger.obj \
+	ConsoleLogSink.obj \
+	FileLogSink.obj \
+	SyslogLogSink.obj \
+	WinDbgLogSink.obj \
+	URL.obj \
+	MIMEType.obj \
+	SpoolRewindInputStream.obj
+
+LOCAL_STATIC_LIB = \
+	crawler.lib
+
+CPP_OBJS = \
+	$(LOCAL_STATIC_LIB_OBJS)
+
+CPP_BINS = \
+	crawl.exe
+
+!INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
+
+crawl.exe: crawl.obj $(CPP_OBJS)
+
+$(LOCAL_STATIC_LIB): $(LOCAL_STATIC_LIB_OBJS)
+	$(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $?
+
+local_all: $(LOCAL_STATIC_LIB) $(CPP_BINS)
+
+local_clean:
+	@-erase $(LOCAL_STATIC_LIB) 2>NUL
+	@-erase $(CPP_OBJS) win32\*.obj 2>NUL
+	@-erase test.bat 2>NUL
+
+local_distclean:
+
+local_test:
+
+copy_prereq:
+	@-copy "$(ICU_DIR)\bin\icuuc49.dll" . >NUL
+ 	@-copy "$(ICU_DIR)\bin\icudt49.dll" . >NUL
+
+run: copy_prereq
+	@-crawl.exe
diff --git a/src/SyslogLogSink.cpp b/src/logger/SyslogLogSink.cpp
index c2716a9..c2716a9 100755
--- a/src/SyslogLogSink.cpp
+++ b/src/logger/SyslogLogSink.cpp
diff --git a/src/WinDbgLogSink.cpp b/src/logger/WinDbgLogSink.cpp
index f5a830c..f5a830c 100755
--- a/src/WinDbgLogSink.cpp
+++ b/src/logger/WinDbgLogSink.cpp
diff --git a/src/win32/syslog_win32.c b/src/logger/win32/syslog_win32.c
index e94bb9e..e94bb9e 100644
--- a/src/win32/syslog_win32.c
+++ b/src/logger/win32/syslog_win32.c
diff --git a/src/win32/syslog_win32.h b/src/logger/win32/syslog_win32.h
index 94157a1..94157a1 100644
--- a/src/win32/syslog_win32.h
+++ b/src/logger/win32/syslog_win32.h
diff --git a/src/modules/deduper/null/GNUmakefile b/src/modules/deduper/null/GNUmakefile
index 7bbfd49..3d1969f 100644
--- a/src/modules/deduper/null/GNUmakefile
+++ b/src/modules/deduper/null/GNUmakefile
@@ -5,7 +5,9 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/fetcher/file/GNUmakefile b/src/modules/fetcher/file/GNUmakefile
index 1714b3a..e081651 100644
--- a/src/modules/fetcher/file/GNUmakefile
+++ b/src/modules/fetcher/file/GNUmakefile
@@ -5,7 +5,9 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/fetcher/libfetch/GNUmakefile b/src/modules/fetcher/libfetch/GNUmakefile
index 7c77a29..745a1b0 100644
--- a/src/modules/fetcher/libfetch/GNUmakefile
+++ b/src/modules/fetcher/libfetch/GNUmakefile
@@ -6,6 +6,8 @@ SUBDIRS =
 
 INCLUDE_DIRS = \
 	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util \
 	-I$(TOPDIR)/libfetch
 
 INCLUDE_CXXFLAGS = \
diff --git a/src/modules/frontier/memory/GNUmakefile b/src/modules/frontier/memory/GNUmakefile
index 368b37e..ddb7ef6 100644
--- a/src/modules/frontier/memory/GNUmakefile
+++ b/src/modules/frontier/memory/GNUmakefile
@@ -5,7 +5,10 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/processor/htmllinkextract/GNUmakefile b/src/modules/processor/htmllinkextract/GNUmakefile
index a9919d0..139841a 100644
--- a/src/modules/processor/htmllinkextract/GNUmakefile
+++ b/src/modules/processor/htmllinkextract/GNUmakefile
@@ -6,6 +6,9 @@ SUBDIRS =
 
 INCLUDE_DIRS = \
 	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module \
 	-I$(TOPDIR)/streamhtmlparser
 
 INCLUDE_CXXFLAGS = \
diff --git a/src/modules/typedetect/libmagic/GNUmakefile b/src/modules/typedetect/libmagic/GNUmakefile
index 2bd823f..4033cb4 100644
--- a/src/modules/typedetect/libmagic/GNUmakefile
+++ b/src/modules/typedetect/libmagic/GNUmakefile
@@ -5,7 +5,10 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/urlfilter/chain/GNUmakefile b/src/modules/urlfilter/chain/GNUmakefile
index 50ce867..790c47a 100644
--- a/src/modules/urlfilter/chain/GNUmakefile
+++ b/src/modules/urlfilter/chain/GNUmakefile
@@ -5,7 +5,10 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/urlfilter/host/GNUmakefile b/src/modules/urlfilter/host/GNUmakefile
index f307eb8..6029ea2 100644
--- a/src/modules/urlfilter/host/GNUmakefile
+++ b/src/modules/urlfilter/host/GNUmakefile
@@ -5,7 +5,10 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/urlfilter/protocol/GNUmakefile b/src/modules/urlfilter/protocol/GNUmakefile
index a4b976c..7151981 100644
--- a/src/modules/urlfilter/protocol/GNUmakefile
+++ b/src/modules/urlfilter/protocol/GNUmakefile
@@ -5,7 +5,10 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/urlnormalizer/googleurl/GNUmakefile b/src/modules/urlnormalizer/googleurl/GNUmakefile
index 9bafab5..bf95037 100644
--- a/src/modules/urlnormalizer/googleurl/GNUmakefile
+++ b/src/modules/urlnormalizer/googleurl/GNUmakefile
@@ -6,6 +6,8 @@ SUBDIRS =
 
 INCLUDE_DIRS = \
 	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util \
 	-I$(TOPDIR)/googleurl
 
 INCLUDE_CXXFLAGS = \
diff --git a/src/modules/urlnormalizer/simpleurl/GNUmakefile b/src/modules/urlnormalizer/simpleurl/GNUmakefile
index 71d516e..3654bd4 100644
--- a/src/modules/urlnormalizer/simpleurl/GNUmakefile
+++ b/src/modules/urlnormalizer/simpleurl/GNUmakefile
@@ -5,7 +5,9 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/urlseen/memory/GNUmakefile b/src/modules/urlseen/memory/GNUmakefile
index db5e428..2ece46a 100644
--- a/src/modules/urlseen/memory/GNUmakefile
+++ b/src/modules/urlseen/memory/GNUmakefile
@@ -5,7 +5,10 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/tests/fetcher/GNUmakefile b/tests/fetcher/GNUmakefile
index d6fa6ad..a3fc685 100644
--- a/tests/fetcher/GNUmakefile
+++ b/tests/fetcher/GNUmakefile
@@ -7,17 +7,21 @@ SUBDIRS =
 	
 INCLUDE_DIRS = \
 	-I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module \
 	-I$(TOPDIR)/src/modules/urlnormalizer/simpleurl \
 	-I$(TOPDIR)/src/modules/fetcher/libfetch
 
 INCLUDE_LDFLAGS = \
 	-L$(TOPDIR)/src \
+	-L$(TOPDIR)/src/logger \
 	-L$(TOPDIR)/libfetch
 
 INCLUDE_LIBS = \
 	$(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \
 	$(TOPDIR)/src/modules/fetcher/libfetch/liblibfetchfetcher.a \
 	-lcrawler \
+	-llogger \
 	-lfetch
 
 # openssl
diff --git a/tests/fetcher/run.sh b/tests/fetcher/run.sh
new file mode 100755
index 0000000..7a10182
--- /dev/null
+++ b/tests/fetcher/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+LD_LIBRARY_PATH=../../src:../../src/logger:../../libfetch ./test1 $*
+
diff --git a/tests/libfetch/GNUmakefile b/tests/libfetch/GNUmakefile
index 4452964..6fceef6 100644
--- a/tests/libfetch/GNUmakefile
+++ b/tests/libfetch/GNUmakefile
@@ -38,3 +38,9 @@ local_clean:
 local_distclean:
 
 local_test:
+
+run1:
+	@LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./test1 http://localhost
+
+run2:
+	@LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/googleurl:$(TOPDIR)/libfetch:$(TOPDIR)/streamhtmlparser ./test2 http://localhost
diff --git a/tests/logger/GNUmakefile b/tests/logger/GNUmakefile
index b0e2db0..6578f15 100755
--- a/tests/logger/GNUmakefile
+++ b/tests/logger/GNUmakefile
@@ -3,12 +3,15 @@ TOPDIR = ../..
 SUBDIRS =
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/logger \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_LDFLAGS =
 
 INCLUDE_LIBS = \
-	$(TOPDIR)/src/libcrawler.a
+	$(TOPDIR)/src/libcrawler.a \
+	$(TOPDIR)/src/logger/liblogger.a
 
 TEST_CPP_BINS = \
 	test1$(EXE)
diff --git a/tests/logger/test1.MUST b/tests/logger/test1.MUST
index 0752988..65ebb58 100644
--- a/tests/logger/test1.MUST
+++ b/tests/logger/test1.MUST
@@ -1,3 +1,4 @@
+WARNING: WinDbg logger is only available on Windows
 FATAL: fatal error
 CRITICAL: critical error
 ERROR: error
diff --git a/tests/modules/GNUmakefile b/tests/modules/GNUmakefile
index 7a1ee57..ba0040b 100755
--- a/tests/modules/GNUmakefile
+++ b/tests/modules/GNUmakefile
@@ -3,11 +3,16 @@ TOPDIR = ../..
 SUBDIRS = testmod testmod2 testmod3
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
-INCLUDE_LDFLAGS =
+INCLUDE_LDFLAGS = \
+	-L$(TOPDIR)/src/logger
 
-INCLUDE_LIBS =
+INCLUDE_LIBS = \
+	$(TOPDIR)/src/libcrawler.a \
+	-llogger
 
 TEST_CPP_BINS = \
 	test1$(EXE) \
diff --git a/tests/modules/exec_test b/tests/modules/exec_test
index a2a6609..626d298 100755
--- a/tests/modules/exec_test
+++ b/tests/modules/exec_test
@@ -4,5 +4,5 @@ BINARY=$1
 TITLE=$2
 
 printf "$BINARY: $TITLE .. "
-LD_LIBRARY_PATH=../../src ./$BINARY >$BINARY.RES 2>&1
+LD_LIBRARY_PATH=../../src:../../src/logger ./$BINARY >$BINARY.RES 2>&1
 diff $BINARY.MUST $BINARY.RES > $BINARY.DIFF && printf "OK\n" || printf "ERROR\n"
diff --git a/tests/modules/testmod/GNUmakefile b/tests/modules/testmod/GNUmakefile
index 01dbfee..c8fbc8a 100755
--- a/tests/modules/testmod/GNUmakefile
+++ b/tests/modules/testmod/GNUmakefile
@@ -5,7 +5,9 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src -I..
+	-I. -I$(TOPDIR)/src -I.. \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/tests/modules/testmod2/GNUmakefile b/tests/modules/testmod2/GNUmakefile
index 90f1f05..5e4630f 100755
--- a/tests/modules/testmod2/GNUmakefile
+++ b/tests/modules/testmod2/GNUmakefile
@@ -5,7 +5,9 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src -I..
+	-I. -I$(TOPDIR)/src -I.. \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/tests/modules/testmod3/GNUmakefile b/tests/modules/testmod3/GNUmakefile
index 01ae8eb..643fd6a 100755
--- a/tests/modules/testmod3/GNUmakefile
+++ b/tests/modules/testmod3/GNUmakefile
@@ -5,7 +5,9 @@ SUBDIRS =
 -include $(TOPDIR)/makefiles/gmake/platform.mk
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src -I..
+	-I. -I$(TOPDIR)/src -I.. \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/tests/streamhtmlparser/GNUmakefile b/tests/streamhtmlparser/GNUmakefile
index 23ad8b7..5adf17d 100644
--- a/tests/streamhtmlparser/GNUmakefile
+++ b/tests/streamhtmlparser/GNUmakefile
@@ -26,3 +26,9 @@ local_clean:
 local_distclean:
 
 local_test:
+
+run1:
+	@LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/streamhtmlparser ./test1 test1.html
+
+run2:
+	@LD_LIBRARY_PATH=$(TOPDIR)/src:$(TOPDIR)/src/logger:$(TOPDIR)/streamhtmlparser ./test2 test1.html
diff --git a/tests/typedetect/GNUmakefile b/tests/typedetect/GNUmakefile
index 6fed180..065d95b 100644
--- a/tests/typedetect/GNUmakefile
+++ b/tests/typedetect/GNUmakefile
@@ -7,6 +7,8 @@ SUBDIRS =
 	
 INCLUDE_DIRS = \
 	-I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/util \
+	-I$(TOPDIR)/include/module \
 	-I$(TOPDIR)/src/modules/typedetect/libmagic \
 	-I$(TOPDIR)/src/modules/fetcher/file \
 	-I$(TOPDIR)/src/modules/fetcher/libfetch \
@@ -14,6 +16,7 @@ INCLUDE_DIRS = \
 
 INCLUDE_LDFLAGS = \
 	-L$(TOPDIR)/src \
+	-L$(TOPDIR)/src/logger \
 	-L$(TOPDIR)/libfetch
 
 INCLUDE_LIBS = \
@@ -23,7 +26,8 @@ INCLUDE_LIBS = \
 	$(TOPDIR)/src/modules/fetcher/libfetch/liblibfetchfetcher.a \
 	-lfetch \
 	$(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \
-	-lcrawler
+	-lcrawler \
+	-llogger
 
 # openssl
 ifeq ($(WITH_SSL),1)
diff --git a/tests/typedetect/exec_test b/tests/typedetect/exec_test
index 5d3d9b1..58747f4 100755
--- a/tests/typedetect/exec_test
+++ b/tests/typedetect/exec_test
@@ -8,5 +8,5 @@ TITLE=$1
 shift
 
 printf "$ID: $TITLE .. "
-LD_LIBRARY_PATH=../../src:../../libfetch ./$BINARY $* >$ID.RES 2>&1
+LD_LIBRARY_PATH=../../src:../../src/logger:../../libfetch ./$BINARY $* >$ID.RES 2>&1
 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n"
diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile
index 47812da..e99e178 100644
--- a/tests/url/GNUmakefile
+++ b/tests/url/GNUmakefile
@@ -8,10 +8,13 @@ SUBDIRS =
 INCLUDE_DIRS = \
 	-I$(TOPDIR)/src \
 	-I$(TOPDIR)/src/modules/urlnormalizer/simpleurl \
-	-I$(TOPDIR)/src/modules/urlnormalizer/googleurl
+	-I$(TOPDIR)/src/modules/urlnormalizer/googleurl \
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_LDFLAGS = \
 	-L$(TOPDIR)/src \
+	-L$(TOPDIR)/src/logger \
 	-L$(TOPDIR)/googleurl
 
 INCLUDE_LIBS = \
@@ -20,6 +23,7 @@ INCLUDE_LIBS = \
 	$(TOPDIR)/src/modules/urlnormalizer/googleurl/libgoogleurlnormalizer.a \
 	-lgoogleurl \
 	-lcrawler \
+	-llogger \
 	-licui18n -licuuc
 
 TEST_CPP_BINS = \
diff --git a/tests/url/exec_test b/tests/url/exec_test
index 2343af8..5ad22e1 100755
--- a/tests/url/exec_test
+++ b/tests/url/exec_test
@@ -8,5 +8,5 @@ TITLE=$1
 shift
 
 printf "$ID: $TITLE .. "
-LD_LIBRARY_PATH=../../src:../../googleurl ./$BINARY $* >$ID.RES 2>&1
+LD_LIBRARY_PATH=../../src:../../src/logger:../../googleurl ./$BINARY $* >$ID.RES 2>&1
 diff $ID.MUST $ID.RES > $ID.DIFF && printf "OK\n" || printf "ERROR\n"
diff --git a/tests/utils/GNUmakefile b/tests/utils/GNUmakefile
index 1acc028..98526e7 100755
--- a/tests/utils/GNUmakefile
+++ b/tests/utils/GNUmakefile
@@ -3,7 +3,8 @@ TOPDIR = ../..
 SUBDIRS =
 
 INCLUDE_DIRS = \
-	-I. -I$(TOPDIR)/src
+	-I. -I$(TOPDIR)/src \
+	-I$(TOPDIR)/include/util
 
 INCLUDE_LDFLAGS =