First go for nmake makefile for yaz++

diff --git a/win/makefile b/win/makefile
new file mode 100644 (file)
index 0000000..bff38de
--- /dev/null
+++ b/win/makefile
@@ -0,0 +1,353 @@
+# Copyright (C) 1993-2004, Index Data ApS
+# All rights reserved.
+# $Id: makefile,v 1.1 2004-03-30 17:42:25 adam Exp $
+
+###########################################################
+############### Parameters 
+###########################################################
+
+DEBUG=0   # 0 for release, 1 for debug
+
+# YAZ
+YAZ_DIR=c:\yaz
+
+# iconv charcter conversion utility
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.9.1.win32
+
+# libxslt
+HAVE_LIBXSLT=1
+LIBXSLT_DIR=c:\libxslt-1.1.4.win32
+
+# libxml2 (used by libxslt)
+HAVE_LIBXML2=1
+LIBXML2_DIR=c:\libxml2-2.6.7.win32
+
+# zlib compression (used by libxml2)
+ZLIB_DIR = c:\zlib-1.1.4.win32
+
+# get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
+# http://www.zlatkovic.com/libxml.en.html
+
+default: all
+
+all: dirs dll proxy iconv libxml2 libxslt
+
+NSIS="c:\program files\nsis\makensis-bz2.exe"
+
+nsis: all
+       $(NSIS) yazpp.nsi
+
+nsishelp:
+       $(NSIS)
+
+###########################################################
+############### Directories
+###########################################################
+# The current directory is supposed to be something like
+# ..../yaz/win, everything is relative to that
+ROOTDIR=..   # The home of yaz++
+
+INCLDIR=$(ROOTDIR)\include  # our includes
+LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
+BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
+WINDIR=$(ROOTDIR)\win       # all these Win make things
+OBJDIR=$(WINDIR)\obj        # where we store intermediate files
+SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
+PROXYDIR=$(ROOTDIR)\proxy
+ZOOMDIR=$(ROOTDIR)\zoom
+
+TMPDIR=$(ROOTDIR)\win\tmp
+TMP=$(TMPDIR)
+
+###########################################################
+############### Targets - what to make
+###########################################################
+
+YAZPP_DLL=$(BINDIR)\yazpp.dll
+YAZPROXY_DLL=$(BINDIR)\yazproxy.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
+YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib
+
+YAZPROXY=$(BINDIR)\yaz-proxy.exe
+
+# shortcut names defined here
+dll: $(YAZPP_DLL) $(YAZPROXY_DLL)
+proxy: $(YAZPROXY)
+
+###########################################################
+############### Compiler and linker options 
+###########################################################
+
+YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
+YAZ_DEF=/I"$(YAZ_DIR)\include"
+
+!if $(HAVE_ICONV)
+ICONV_DEF= \
+  /D HAVE_ICONV_H=1 \
+  /I"$(ICONV_DIR)\include"
+ICONV_LIB= \
+  "$(ICONV_DIR)\lib\iconv.lib"
+iconv: $(BINDIR)\iconv.dll
+
+$(BINDIR)\iconv.dll:
+  copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
+!else
+ICONV_DEF= \
+  /D HAVE_ICONV_H=0
+ICONV_LIB=
+iconv:
+
+!endif
+
+!if $(HAVE_LIBXML2)
+LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
+LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll
+
+$(BINDIR)\libxml2.dll:
+  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+
+$(BINDIR)\zlib.dll:
+  copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+
+!else
+LIBXML2_LIB=
+LIBXML2_DEF=/D HAVE_XML2=0
+libxml2: 
+
+!endif
+
+!if $(HAVE_LIBXSLT)
+LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
+LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
+libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib.dll
+
+$(BINDIR)\libxslt.dll:
+  copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
+
+!else
+LIBXSLT_LIB=
+LIBXSLT_DEF=/D HAVE_XSLT=0
+libxslt: 
+
+!endif
+
+
+### C and CPP compiler  (the same thing)
+# Note: $(CPP) has already been defined in the environment
+# (if you set things up right!)
+
+COMMON_C_OPTIONS=          \
+  /nologo /W3 /GX /FD /c   \
+  $(ICONV_DEF)             \
+  $(YAZ_DEF)               \
+  $(LIBXML2_DEF)           \
+  $(LIBXSLT_DEF)           \
+  /D "_WINDOWS"            \
+  /D "WIN32"               \
+  /D "HAVE_WCHAR_H=1"      \
+  /FR"$(OBJDIR)\\"         \
+  /Fo"$(OBJDIR)\\"         \
+  /Fd"$(OBJDIR)\\" 
+
+COMMON_C_INCLUDES= \
+  /I"$(ROOTDIR)\include"
+
+DEBUG_C_OPTIONS=  \
+  /D "_DEBUG"      \
+  /MDd  /Od /YX /Zi /Gm
+
+RELEASE_C_OPTIONS=  \
+  /D "NDEBUG"        \
+  /MD /O2
+
+# /W3  = warning level
+# /GX  = Enable exception handling
+# /FD  = Generate file dependencies (what ever they are)
+# /c   = compile without linking
+# /FR  = Generate browse info (.sbr file that gets combined into .bsc)
+# /Fo  = object file name (or at least path)
+# /Fd  = debug database name (or path)
+# /MD  = Runtime library: Multithread DLL
+# /MDd = Runtime library: Multithread DLL (debug)
+# /Od  = Disable optimising (debug)
+# /O2  = Optimize for speed
+# /YX  = Automatic use of precomipled headers
+# /Gm  = Minimal rebuild (some cpp class stuff)
+# /Zi  = Program database for debuggers
+# /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
+
+
+### Linker options
+LINK=link.exe
+
+LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
+           advapi32.lib uuid.lib \
+           wsock32.lib  advapi32.lib \
+           $(YAZ_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+
+COMMON_LNK_OPTIONS= /nologo \
+                    /subsystem:windows \
+                    /machine:i386 \
+                         /incremental:no
+
+DEBUG_LNK_OPTIONS= /debug 
+
+RELEASE_LNK_OPTIONS=
+
+DLL_LINK_OPTIONS= /dll  
+CLIENT_LINK_OPTIONS = /subsystem:console  
+
+# Final opt variables
+!if $(DEBUG)
+COPT=   $(COMMON_C_OPTIONS)   $(DEBUG_C_OPTIONS)     $(COMMON_C_INCLUDES)
+MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS)
+RCOPT=  $(COMMON_RC_OPTIONS)  $(DEBUG_RC_OPTIONS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
+TCLOPT= $(COMMON_TCL_OPTIONS)
+
+!else
+COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
+MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS)
+RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
+TCLOPT= $(COMMON_TCL_OPTIONS)
+!endif
+
+###########################################################
+###############  Source and object modules
+###########################################################
+
+YAZPROXY_OBJS= \
+   "$(OBJDIR)\yaz-proxy-main.obj"
+
+YAZPP_DLL_OBJS = \
+   "$(OBJDIR)\yaz-socket-manager.obj" \
+   "$(OBJDIR)\yaz-pdu-assoc.obj" \
+   "$(OBJDIR)\yaz-z-assoc.obj" \
+   "$(OBJDIR)\yaz-z-query.obj" \
+   "$(OBJDIR)\yaz-ir-assoc.obj" \
+   "$(OBJDIR)\yaz-z-server.obj" \
+   "$(OBJDIR)\yaz-pdu-assoc-thread.obj" \
+   "$(OBJDIR)\yaz-z-server-sr.obj" \
+   "$(OBJDIR)\yaz-z-server-ill.obj" \
+   "$(OBJDIR)\yaz-z-server-update.obj" \
+   "$(OBJDIR)\yaz-z-databases.obj" \
+   "$(OBJDIR)\yaz-z-cache.obj" \
+   "$(OBJDIR)\yaz-cql2rpn.obj"
+
+YAZPROXY_DLL_OBJS = \
+   "$(OBJDIR)\yaz-proxy.obj" \
+   "$(OBJDIR)\yaz-proxy-config.obj" \
+   "$(OBJDIR)\yaz-bw.obj
+
+###########################################################
+############### Compiling 
+###########################################################
+
+# Note: This defines where to look for the necessary
+# source files. Funny way of doing it, but it works.
+
+# yaz proxy
+{$(PROXYDIR)}.cpp{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $<
+
+# Various YAZ source directories
+{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
+       $(CPP) $(COPT) $< 
+
+{$(ZOOMDIR)}.cpp{$(OBJDIR)}.obj:
+       $(CPP) $(COPT) $< 
+
+###########################################################
+############### Resources
+###########################################################
+
+### The RC compiler (resource files)
+RSC=rc.exe
+COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
+DEBUG_RC_OPTIONS=/d "_DEBUG"
+RELEASE_RC_OPTIONS=/d "NDEBUG"
+
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_RC=$(WINDIR)\yaz.rc
+
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
+
+$(YAZ_RES): $(YAZ_RC)
+       $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) 
+
+###########################################################
+############### Linking
+###########################################################
+
+$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
+       @echo Linking $(YAZPP_DLL)
+       $(LINK) @<<
+               $(LNKOPT) 
+               $(LINK_LIBS) 
+               $(DLL_LINK_OPTIONS)
+               $(YAZPP_DLL_OBJS)
+               /out:"$(YAZPP_DLL)"
+               /implib:$(YAZPP_IMPLIB)
+               /map:"$(LIBDIR)\yazpp.map"  
+<<
+
+$(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS)
+       @echo Linking $(YAZPROXY_DLL)
+       $(LINK) @<<
+               $(LNKOPT) 
+               $(LINK_LIBS) 
+               $(DLL_LINK_OPTIONS)
+               $(YAZPROXY_DLL_OBJS)
+               /out:$(YAZPROXY_DLL) 
+               /implib:"$(YAZPROXY_IMPLIB)"
+               /map:"$(LIBDIR)\yazproxy.map"  
+<<
+
+
+$(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPP_IMPLIB) $(YAZPROXY_IMPLIB)
+       @echo Linking $(YAZPROXY)
+       $(LINK) @<<
+        $(LNKOPT) 
+               $(CLIENT_LINK_OPTIONS)
+               $(LINK_LIBS) 
+            $(YAZPP_IMPLIB)
+             $(YAZPROXY_IMPLIB)
+               $(IMPLIB)
+               $(YAZPROXY_OBJS)
+               /map:"$(LIBDIR)\yaz-proxy.map"
+               /out:$(YAZPROXY)
+<<
+# note that this links a lib, so it uses completely different options.
+
+###########################################################
+############### Special operations
+###########################################################
+
+
+############## clean
+clean:
+       -del $(BINDIR)\*.exe
+       -del $(BINDIR)\*.dll
+       -del $(TMPDIR)\*.
+       -del $(LIBDIR)\*.MAP
+       -del $(LIBDIR)\*.LIB
+       -del $(OBJDIR)\*.OBJ
+
+realclean: clean
+# Because DOS del will only accept one file name to delete,
+# the _H_ files work only on sets that have just one file.
+# Z3950_H_FILES had to be spelled out. One more point for MS!
+
+########### check directories and create if needed
+dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
+
+$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
+       if not exist "$@/$(NUL)" mkdir "$@"
+