more splitting into libcrawl, crawl binary

moved more public header to 'include'
changed approach for dynamic linking on Windows

9 files changed, 33 insertions, 17 deletions

diff --git a/src/modules/deduper/null/Makefile.W32 b/src/modules/deduper/null/Makefile.W32
index e01235f..e0d6c60 100755
--- a/src/modules/deduper/null/Makefile.W32
+++ b/src/modules/deduper/null/Makefile.W32
@@ -11,12 +11,21 @@ INCLUDE_DIRS = \
 	/I. \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
-	/I$(TOPDIR)\include\util
+	/I$(TOPDIR)\include\util \
+	/I$(TOPDIR)\include\crawler
+
+copy_prereq:
+	@-copy "$(ICU_DIR)\bin\icuuc49.dll" . >NUL
+ 	@-copy "$(ICU_DIR)\bin\icudt49.dll" . >NUL
+	@-copy "$(TOPDIR)\src\logger\logger.dll" . >NUL
+
+run: copy_prereq
+	@-crawl.exe
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib
+	$(TOPDIR)\src\libcrawler\crawler.lib
 
 DYNAMIC_MODULE = \
 	mod_deduper_null.dll
diff --git a/src/modules/fetcher/file/Makefile.W32 b/src/modules/fetcher/file/Makefile.W32
index 3203d6d..a77daa6 100755
--- a/src/modules/fetcher/file/Makefile.W32
+++ b/src/modules/fetcher/file/Makefile.W32
@@ -11,12 +11,13 @@ INCLUDE_DIRS = \
 	/I. \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
-	/I$(TOPDIR)\include\util
+	/I$(TOPDIR)\include\util \
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib
+	$(TOPDIR)\src\libcrawler\crawler.lib
 
 DYNAMIC_MODULE = \
 	mod_fetcher_file.dll
diff --git a/src/modules/fetcher/winhttp/Makefile.W32 b/src/modules/fetcher/winhttp/Makefile.W32
index b46aa88..4cedb9c 100755
--- a/src/modules/fetcher/winhttp/Makefile.W32
+++ b/src/modules/fetcher/winhttp/Makefile.W32
@@ -12,12 +12,13 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
-	/I$(TOPDIR)\include\logger
+	/I$(TOPDIR)\include\logger \
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib \
+	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\src\logger\logger.lib \
 	WinHttp.lib
 
diff --git a/src/modules/frontier/memory/Makefile.W32 b/src/modules/frontier/memory/Makefile.W32
index b44d95f..b12e4ca 100755
--- a/src/modules/frontier/memory/Makefile.W32
+++ b/src/modules/frontier/memory/Makefile.W32
@@ -12,12 +12,13 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
-	/I$(TOPDIR)\include\logger
+	/I$(TOPDIR)\include\logger \
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib \
+	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\src\logger\logger.lib
 
 DYNAMIC_MODULE = \
diff --git a/src/modules/urlfilter/chain/Makefile.W32 b/src/modules/urlfilter/chain/Makefile.W32
index 5a766ab..d3ad373 100755
--- a/src/modules/urlfilter/chain/Makefile.W32
+++ b/src/modules/urlfilter/chain/Makefile.W32
@@ -12,12 +12,12 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
-	/I$(TOPDIR)\include\logger
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib
+	$(TOPDIR)\src\libcrawler\crawler.lib
 
 DYNAMIC_MODULE = \
 	mod_urlfilter_chain.dll
diff --git a/src/modules/urlfilter/host/Makefile.W32 b/src/modules/urlfilter/host/Makefile.W32
index 3b99125..024dc67 100755
--- a/src/modules/urlfilter/host/Makefile.W32
+++ b/src/modules/urlfilter/host/Makefile.W32
@@ -12,12 +12,13 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
-	/I$(TOPDIR)\include\logger
+	/I$(TOPDIR)\include\logger \
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib \
+	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\src\logger\logger.lib
 
 DYNAMIC_MODULE = \
diff --git a/src/modules/urlfilter/protocol/Makefile.W32 b/src/modules/urlfilter/protocol/Makefile.W32
index 747d714..e859829 100755
--- a/src/modules/urlfilter/protocol/Makefile.W32
+++ b/src/modules/urlfilter/protocol/Makefile.W32
@@ -12,12 +12,13 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
-	/I$(TOPDIR)\include\logger
+	/I$(TOPDIR)\include\logger \
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib \
+	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\src\logger\logger.lib
 
 DYNAMIC_MODULE = \
diff --git a/src/modules/urlnormalizer/googleurl/Makefile.W32 b/src/modules/urlnormalizer/googleurl/Makefile.W32
index 4cc09c1..a906404 100755
--- a/src/modules/urlnormalizer/googleurl/Makefile.W32
+++ b/src/modules/urlnormalizer/googleurl/Makefile.W32
@@ -12,13 +12,14 @@ INCLUDE_DIRS = \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
 	/I$(TOPDIR)\include\util \
+	/I$(TOPDIR)\include\crawler \
 	/I$(TOPDIR)\googleurl
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
 	$(TOPDIR)\googleurl\googleurl.lib \
-	$(TOPDIR)\src\crawler.lib \
+	$(TOPDIR)\src\libcrawler\crawler.lib \
 	"$(ICU_DIR)\lib\icuuc.lib"
 
 DYNAMIC_MODULE = \
diff --git a/src/modules/urlnormalizer/simpleurl/Makefile.W32 b/src/modules/urlnormalizer/simpleurl/Makefile.W32
index 69e732a..2a26e9c 100755
--- a/src/modules/urlnormalizer/simpleurl/Makefile.W32
+++ b/src/modules/urlnormalizer/simpleurl/Makefile.W32
@@ -11,12 +11,13 @@ INCLUDE_DIRS = \
 	/I. \
 	/I$(TOPDIR)\src \
 	/I$(TOPDIR)\include\module \
-	/I$(TOPDIR)\include\util
+	/I$(TOPDIR)\include\util \
+	/I$(TOPDIR)\include\crawler
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib
+	$(TOPDIR)\src\libcrawler\crawler.lib
 
 DYNAMIC_MODULE = \
 	mod_urlnormalizer_simple.dll