more splitting into libcrawl, crawl binary

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

1 files changed, 4 insertions, 49 deletions

diff --git a/src/Makefile.W32 b/src/Makefile.W32
index ffcbe27..f3702cf 100755
--- a/src/Makefile.W32
+++ b/src/Makefile.W32
@@ -1,58 +1,12 @@
 TOPDIR = ..
 
-SUBDIRS = logger modules
-
-!INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk
-
-INCLUDE_CXXFLAGS = \
-	/D_WIN32_WINNT=0x504
-
-INCLUDE_DIRS = \
-	/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 = \
-	win32\errormsg.obj \
-	win32\stringutils.obj \
-	URL.obj \
-	MIMEType.obj \
-	SpoolRewindInputStream.obj
-
-LOCAL_STATIC_LIB = \
-	crawler.lib
-
-CPP_OBJS = \
-	$(LOCAL_STATIC_LIB_OBJS)
-
-CPP_BINS = \
-	crawl.exe
+SUBDIRS = logger libcrawler modules crawl
 
 !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)
-	$(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $?
-
-local_all: $(LOCAL_STATIC_LIB) $(CPP_BINS)
+local_all:
 
 local_clean:
-	@-erase $(LOCAL_STATIC_LIB) 2>NUL
-	@-erase $(CPP_OBJS) win32\*.obj 2>NUL
-	@-erase test.bat 2>NUL
 
 local_distclean:
 
@@ -62,6 +16,7 @@ copy_prereq:
 	@-copy "$(ICU_DIR)\bin\icuuc49.dll" . >NUL
  	@-copy "$(ICU_DIR)\bin\icudt49.dll" . >NUL
 	@-copy "$(TOPDIR)\src\logger\logger.dll" . >NUL
+	@-copy "$(TOPDIR)\src\libcrawler\crawler.dll" . >NUL
 
 run: copy_prereq
-	@-crawl.exe
+	@-crawl\crawl.exe