started to solve the logger dll problem on Windows

6 files changed, 38 insertions, 39 deletions

diff --git a/src/Makefile.W32 b/src/Makefile.W32
index 604b8c4..ffcbe27 100755
--- a/src/Makefile.W32
+++ b/src/Makefile.W32
@@ -8,11 +8,15 @@ INCLUDE_CXXFLAGS = \
 	/D_WIN32_WINNT=0x504
 
 INCLUDE_DIRS = \
-	/I.
+	/I. \
+	/I$(TOPDIR)\include\logger \
+	/I$(TOPDIR)\include\module \
+	/I$(TOPDIR)\include\util
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
+	$(TOPDIR)\src\logger\logger.lib \
 	Ws2_32.lib
 
 LOCAL_STATIC_LIB_OBJS = \
@@ -33,6 +37,11 @@ CPP_BINS = \
 
 !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
 
+all: dependencies $(CPP_OBJS) $(CPP_BINS)
+
+dependencies:
+	cd logger & $(MAKE) /nologo /f Makefile.w32 all
+
 crawl.exe: crawl.obj $(CPP_OBJS)
 
 $(LOCAL_STATIC_LIB): $(LOCAL_STATIC_LIB_OBJS)
@@ -52,6 +61,7 @@ local_test:
 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
diff --git a/src/logger/Makefile.W32 b/src/logger/Makefile.W32
index ea2e6fc..e985e7a 100755
--- a/src/logger/Makefile.W32
+++ b/src/logger/Makefile.W32
@@ -1,4 +1,4 @@
-TOPDIR = ..
+TOPDIR = ..\..
 
 SUBDIRS =
 
@@ -8,56 +8,37 @@ INCLUDE_CXXFLAGS = \
 	/D_WIN32_WINNT=0x504
 
 INCLUDE_DIRS = \
-	/I.
+	/I. \
+	/I$(TOPDIR)\include\logger \
+	/I$(TOPDIR)\include\util
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
 	Ws2_32.lib
 
-LOCAL_STATIC_LIB_OBJS = \
-	win32\errormsg.obj \
-	win32\stringutils.obj \
+CPP_OBJS = \
 	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
+	WinDbgLogSink.obj
+	
+DYNAMIC_LIB = \
+	logger.dll
 
 !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) $?
+$(DYNAMIC_LIB): $(CPP_OBJS)
+	$(LINK) /nologo /dll /out:$@ $(LDFLAGS) $(LIBS) $?
 
-local_all: $(LOCAL_STATIC_LIB) $(CPP_BINS)
+local_all: $(DYNAMIC_LIB)
 
 local_clean:
-	@-erase $(LOCAL_STATIC_LIB) 2>NUL
-	@-erase $(CPP_OBJS) win32\*.obj 2>NUL
-	@-erase test.bat 2>NUL
+	@-erase $(DYNAMIC_LIB) 2>NUL
+	@-erase win32\*.obj 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/modules/urlfilter/protocol/GNUmakefile b/src/modules/urlfilter/protocol/GNUmakefile
index 7151981..53a56df 100644
--- a/src/modules/urlfilter/protocol/GNUmakefile
+++ b/src/modules/urlfilter/protocol/GNUmakefile
@@ -6,9 +6,9 @@ SUBDIRS =
 
 INCLUDE_DIRS = \
 	-I. -I$(TOPDIR)/src \
-	-I$(TOPDIR)/include/logger \
 	-I$(TOPDIR)/include/util \
-	-I$(TOPDIR)/include/module
+	-I$(TOPDIR)/include/module \
+	-I$(TOPDIR)/include/logger
 
 INCLUDE_CXXFLAGS = \
 
diff --git a/src/modules/urlfilter/protocol/Makefile.W32 b/src/modules/urlfilter/protocol/Makefile.W32
index ff1b497..747d714 100755
--- a/src/modules/urlfilter/protocol/Makefile.W32
+++ b/src/modules/urlfilter/protocol/Makefile.W32
@@ -9,12 +9,16 @@ INCLUDE_CXXFLAGS = \
 
 INCLUDE_DIRS = \
 	/I. \
-	/I$(TOPDIR)\src
+	/I$(TOPDIR)\src \
+	/I$(TOPDIR)\include\module \
+	/I$(TOPDIR)\include\util \
+	/I$(TOPDIR)\include\logger
 
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\crawler.lib
+	$(TOPDIR)\src\crawler.lib \
+	$(TOPDIR)\src\logger\logger.lib
 
 DYNAMIC_MODULE = \
 	mod_urlfilter_protocol.dll
diff --git a/src/modules/urlnormalizer/googleurl/Makefile.W32 b/src/modules/urlnormalizer/googleurl/Makefile.W32
index ac94a5c..4cc09c1 100755
--- a/src/modules/urlnormalizer/googleurl/Makefile.W32
+++ b/src/modules/urlnormalizer/googleurl/Makefile.W32
@@ -10,6 +10,8 @@ INCLUDE_CXXFLAGS = \
 INCLUDE_DIRS = \
 	/I. \
 	/I$(TOPDIR)\src \
+	/I$(TOPDIR)\include\module \
+	/I$(TOPDIR)\include\util \
 	/I$(TOPDIR)\googleurl
 
 INCLUDE_LDFLAGS = \
diff --git a/src/modules/urlnormalizer/simpleurl/Makefile.W32 b/src/modules/urlnormalizer/simpleurl/Makefile.W32
index 5dc0dba..69e732a 100755
--- a/src/modules/urlnormalizer/simpleurl/Makefile.W32
+++ b/src/modules/urlnormalizer/simpleurl/Makefile.W32
@@ -9,7 +9,9 @@ INCLUDE_CXXFLAGS = \
 
 INCLUDE_DIRS = \
 	/I. \
-	/I$(TOPDIR)\src
+	/I$(TOPDIR)\src \
+	/I$(TOPDIR)\include\module \
+	/I$(TOPDIR)\include\util
 
 INCLUDE_LDFLAGS = \