X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=2d73d8c22ef6d85341c501bc1c42d0b7acaa34c8;hp=75c9b813e46c9721f1a822e00a532e09c575315a;hb=27d70cebc8400fd364453a6bf9445531a66872d9;hpb=029570b7f2633e2b56053c1c51ed140c77dfd26f

diff --git a/win/makefile b/win/makefile
index 75c9b81..2d73d8c 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,58 +1,66 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.41 2006-02-23 14:43:13 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
 DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 0
+
+# TCL is optional - ONLY needed for source straight from Git
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
+HAVE_TCL=1
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR=c:\Expat-1.95.8
+EXPAT_DIR=c:\Program files (x86)\Expat 2.0.1
 
 # iconv is optional
-HAVE_ICONV=1
-ICONV_DIR=c:\iconv-1.9.1.win32
+HAVE_ICONV=0
+ICONV_DIR=c:\iconv-1.9.2.win32
 
-# libxslt. For xslt+alvis
+# libxslt. For mod_dom and mod_alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.28.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
-
-# zlib compression.  Used by libxml2
-ZLIB_DIR = c:\zlib-1.2.3.win32
+LIBXML2_DIR=c:\libxml2-2.9.2.win32
 
-# get WIN32 binaries libxml2 & iconv & zlib from here:
-#  http://www.zlatkovic.com/libxml.en.html
+# ICU support
+HAVE_ICU=1
+ICU_DIR=c:\icu
+ICU_LIB=$(ICU_DIR)\lib
+ICU_BIN=$(ICU_DIR)\bin
+ICU_INCLUDE=$(ICU_DIR)\include
 
 default: all
+all: dirs generate expat iconv yaz dll zserver zebraidx tstflock
 
-all: dirs expat iconv libxml2 libxslt yaz dll zserver zindex 
-
-###########################################################
-############### Directories
-###########################################################
+# Directories
 # The current directory is supposed to be something like
 # ..../Zebra/Win, everything is relative to that
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
-YAZINCL=$(YAZDIR)\include
-YAZLIBS=$(YAZLIB)
+YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
+
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
-YAZLIB=$(YAZDIR)\lib\yazd.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yazd.dll
-YAZ_DLL_TARGET=$(BINDIR)\yazd.dll
+YAZLIB="$(YAZDIR)\lib\yaz5d.lib"
+!if $(HAVE_ICU)
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5d.lib"
+!endif
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll"
 !else
-YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
-YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
+YAZLIB="$(YAZDIR)\lib\yaz5.lib"
+!if $(HAVE_ICU)
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5.lib"
+!endif
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -80,14 +88,11 @@ BFILEDIR=$(SRCDIR)\BFILE
 DFADIR=$(SRCDIR)\DFA
 DICTDIR=$(SRCDIR)\DICT
 ISAMSDIR=$(SRCDIR)\ISAMS
-ISAMDIR=$(SRCDIR)\ISAM
 ISAMCDIR=$(SRCDIR)\ISAMC
 ISAMBDIR=$(SRCDIR)\ISAMB
-RECCTRLDIR=$(SRCDIR)\RECCTRL
 RSETDIR=$(SRCDIR)\RSET
 UTILDIR=$(SRCDIR)\UTIL
 DATA1DIR=$(SRCDIR)\DATA1
-APITESTDIR=$(SRCDIR)\APITEST
 
 # Force temp files in a local temp, easier to clean
 # when nmake crashes and leaves a lot of rubbish behind
@@ -96,7 +101,7 @@ TMP=$(TMPDIR)
 TEMP=$(TMPDIR)
 
 # NSIS
-NSIS="c:\program files\nsis\makensis.exe"
+NSIS="c:\program files (x86)\nsis\makensis.exe"
 
 dist:
 	nmake DEBUG=1 clean
@@ -107,9 +112,7 @@ dist:
 nsis:
 	$(NSIS) zebra.nsi
 
-###########################################################
-############### Targets - what to make
-###########################################################
+# Targets - what to make
 
 !if $(DEBUG)
 DLL=$(BINDIR)\idzebrad.dll
@@ -119,26 +122,23 @@ DLL=$(BINDIR)\idzebra.dll
 IMPLIB=$(LIBDIR)\idzebra.lib
 !endif
 
-ZEBRA_RES=$(OBJDIR)\idzebra.res
-
 ZSERVER=$(BINDIR)\zebrasrv.exe
-ZINDEX=$(BINDIR)\zebraidx.exe
-APITEST=$(BINDIR)\apitest.exe
+ZEBRAIDX=$(BINDIR)\zebraidx.exe
+TSTFLOCK=$(BINDIR)\tstflock.exe
 
 # shortcut names defined here
-zindex: $(ZINDEX)
+zebraidx: $(ZEBRAIDX)
 zserver: $(ZSERVER)
-apitest: $(APITEST)
+tstflock: $(TSTFLOCK)
 dll: $(DLL) 
-###########################################################
-############### Compiler and linker options 
-###########################################################
+
+# External libs and modules (enabled or disabled)
 
 !if $(HAVE_EXPAT)
 EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
-EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
-EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
-EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+EXPAT_LIB= "$(EXPAT_DIR)\bin\libexpat.lib"
+EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\bin\libexpat.dll"
+EXPAT_DLL_TARGET= "$(BINDIR)\libexpat.dll"
 expat: $(EXPAT_DLL_TARGET)
 
 $(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
@@ -166,47 +166,41 @@ iconv:
 
 !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)\zlib1.dll
-
-$(BINDIR)\libxml2.dll:
-  copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
-  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include\libxml2"
 !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)\libxslt.dll:
-  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
-
 !else
 LIBXSLT_LIB=
 LIBXSLT_DEF=/D HAVE_XSLT=0
-libxslt: 
 
 !endif
 
+!if $(HAVE_ICU)
+ICU_DEF= /DYAZ_HAVE_ICU=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
+!else
+ICU_DEF=  /DYAZ_HAVE_ICU=0
+ICU_LIBS=
+!endif
+
 !if $(HAVE_LIBXSLT)
-MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
+MOD_ALVIS_OBJS= $(OBJDIR)\mod_alvis.obj
 MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
-MOD_ALVIS_OBJS= $(OBJDIR)\xslt.obj
-MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_XSLT=1
+
+MOD_DOM_OBJS= $(OBJDIR)\mod_dom.obj
+MOD_DOM_CFLAGS=/DIDZEBRA_STATIC_DOM=1
 !else
 MOD_ALVIS_OBJS=
 MOD_ALVIS_CFLAGS=
-MOD_ALVIS_OBJS=
-MOD_ALVIS_CFLAGS=
+
+MOD_DOM_OBJS=
+MOD_DOM_CFLAGS=
 !endif
 
 ### C and CPP compiler  (the same thing)
@@ -215,13 +209,15 @@ MOD_ALVIS_CFLAGS=
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
-  /D "WIN32"               \
-  /D"_CONSOLE" /D"_MBCS"   \
+  /DYAZ_USE_NEW_LOG=1      \
   /D"_CRT_SECURE_NO_DEPRECATE" \
+  /D"_CRT_NONSTDC_NO_DEPRECATE" \
+  /D "WIN32"               \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
   $(LIBXSLT_DEF)           \
+  $(ICU_DEF)               \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
@@ -234,7 +230,7 @@ COMMON_C_OPTIONS=          \
   /DIDZEBRA_STATIC_GRS_MARC=1 \
   /DIDZEBRA_STATIC_GRS_DANBIB=1 \
   $(MOD_ALVIS_CFLAGS) \
-  $(MOD_XSLT_CFLAGS) \
+  $(MOD_DOM_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -244,11 +240,11 @@ COMMON_C_INCLUDES= \
   $(BZIP2INCLUDE)
 
 DEBUG_C_OPTIONS=  \
-  /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /D "_DEBUG"     \
+  /MDd /Od /Zi /Gm
 
-RELEASE_C_OPTIONS=  \
-  /D "NDEBUG"        \
+RELEASE_C_OPTIONS= \
+  /D "NDEBUG"      \
   /MD /O2
 
 # /W3  = warning level
@@ -270,11 +266,16 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
-           comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
-           oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib \
-	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+# wsock32.lib  advapi32.lib \
+
+LINK_LIBS= kernel32.lib advapi32.lib \
+	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIBS)
 
 COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
 
@@ -286,9 +287,7 @@ ZEBRALIB_LINK_OPTIONS= -lib
 
 DLL_LINK_OPTIONS= /dll  
 
-ZSERVER_LINK_OPTIONS= /subsystem:console  
-ZINDEX_LINK_OPTIONS= /subsystem:console  
-APITEST_LINK_OPTIONS= /subsystem:console  
+CLIENT_LINK_OPTIONS= /subsystem:console  
 
 # Final opt variables
 !if $(DEBUG)
@@ -304,30 +303,45 @@ RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 !endif
 
-###########################################################
-###############  Source and object modules
-###########################################################
+LINK_PROGRAM= $(LINK) \
+		$(LNKOPT) \
+		$(CLIENT_LINK_OPTIONS) \
+		$(IMPLIB) \
+		$(YAZLIB) \
+		$(BZIP2LIB) \
+		$(LINK_LIBS)
 
+
+# Generated sources
+generate: $(INCLDIR)\idzebra\version.h
+
+$(INCLDIR)\idzebra\version.h: $(ROOTDIR)/IDMETA 
+	@cd $(ROOTDIR)\util
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\idzebra\version.h
+
+# Source and object modules
 # Note: Ordinary source files are not specified here at 
 # all, make finds them in suitable dirs. The object modules
 # need to be specified, though
 
 ZSERVER_OBJS= \
-	$(OBJDIR)\zserver.obj 
+	$(OBJDIR)\zebrasrv.obj 
 
 ZEBRAIDX_OBJS= \
-	$(OBJDIR)\main.obj 
-APITEST_OBJS= \
-	$(OBJDIR)\apitest.obj
+	$(OBJDIR)\zebraidx.obj 
+TSTFLOCK_OBJS= \
+	$(OBJDIR)\tstflock.obj
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
-	$(MOD_XSLT_OBJS) \
+        $(MOD_DOM_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
+	$(OBJDIR)\attrfind.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
+	$(OBJDIR)\check_res.obj \
 	$(OBJDIR)\charmap.obj \
 	$(OBJDIR)\close.obj \
 	$(OBJDIR)\commit.obj \
@@ -348,9 +362,9 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\d1_sumout.obj \
 	$(OBJDIR)\d1_sutrs.obj \
 	$(OBJDIR)\d1_tagset.obj \
+	$(OBJDIR)\d1_utils.obj \
 	$(OBJDIR)\d1_varset.obj \
 	$(OBJDIR)\d1_write.obj \
-	$(OBJDIR)\danbibr.obj \
 	$(OBJDIR)\dclose.obj \
 	$(OBJDIR)\dcompact.obj \
 	$(OBJDIR)\delete.obj \
@@ -360,7 +374,9 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\dopen.obj \
 	$(OBJDIR)\drdwr.obj \
+	$(OBJDIR)\exit.obj \
 	$(OBJDIR)\extract.obj \
+	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\imalloc.obj \
 	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\insert.obj \
@@ -368,35 +384,40 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\isamb.obj \
 	$(OBJDIR)\isamc.obj \
 	$(OBJDIR)\isams.obj \
-	$(OBJDIR)\kcompare.obj \
+	$(OBJDIR)\isam_methods.obj \
+	$(OBJDIR)\it_key.obj \
 	$(OBJDIR)\kcontrol.obj \
+	$(OBJDIR)\key_block.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\limit.obj \
-	$(OBJDIR)\lockutil.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
 	$(OBJDIR)\marcomp.obj \
-	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\mod_grs_marc.obj \
 	$(OBJDIR)\merge.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
 	$(OBJDIR)\orddict.obj \
 	$(OBJDIR)\passwddb.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\ranksimilarity.obj \
 	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
+	$(OBJDIR)\records.obj \
 	$(OBJDIR)\recindex.obj \
 	$(OBJDIR)\reckeys.obj \
-	$(OBJDIR)\recstat.obj \
-	$(OBJDIR)\rectext.obj \
-	$(OBJDIR)\regxread.obj \
+	$(OBJDIR)\mod_text.obj \
+	$(OBJDIR)\mod_grs_regx.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
+	$(OBJDIR)\rpnscan.obj \
+	$(OBJDIR)\rpnsearch.obj \
 	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
+	$(OBJDIR)\rset_isam.obj \
 	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsisamc.obj \
 	$(OBJDIR)\rsisams.obj \
@@ -404,47 +425,35 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rsnull.obj \
 	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\rstemp.obj \
-	$(OBJDIR)\safari.obj \
+	$(OBJDIR)\mod_safari.obj \
 	$(OBJDIR)\scan.obj \
 	$(OBJDIR)\set.obj \
-	$(OBJDIR)\sgmlread.obj \
+	$(OBJDIR)\mod_grs_sgml.obj \
 	$(OBJDIR)\snippet.obj \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
-	$(OBJDIR)\symtab.obj \
-	$(OBJDIR)\trav.obj \
+	$(OBJDIR)\stream.obj \
+	$(OBJDIR)\strmap.obj \
+	$(OBJDIR)\su_codec.obj \
 	$(OBJDIR)\trunc.obj \
-	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\untrans.obj \
+	$(OBJDIR)\update_path.obj \
+	$(OBJDIR)\update_file.obj \
+	$(OBJDIR)\version.obj \
+	$(OBJDIR)\mod_grs_xml.obj \
 	$(OBJDIR)\xpath.obj \
+	$(OBJDIR)\zaptterm.obj \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
 	$(OBJDIR)\zinfo.obj \
 	$(OBJDIR)\zint.obj \
-	$(OBJDIR)\zrpn.obj \
-	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\zvrank.obj
-
-ALL_OBJS=\
-  $(ZEBRALIB_OBJS) \
-  $(ZEBRAIDX_OBJS) \
-  $(APITEST_OBJS)  \
-  $(ZSERVER_OBJS)
-
-###########################################################
-############### Compiling 
-###########################################################
+	$(OBJDIR)\zsets.obj
 
+# Compiling 
 # Note: This defines where to look for the necessary
 # source files. Funny way of doing it, but it works.
 
-{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $<
-
-{$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $<
-
-# ZebraLib
 {$(INDEXDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
@@ -460,18 +469,12 @@ ALL_OBJS=\
 {$(ISAMSDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-{$(ISAMDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
-
 {$(ISAMCDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
 {$(ISAMBDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-{$(RECCTRLDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
-
 {$(RSETDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
@@ -481,77 +484,58 @@ ALL_OBJS=\
 {$(DATA1DIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-{$(APITESTDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
-
-###########################################################
-############### Linking
-###########################################################
+# Linking
 
 $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(IMPLIB)
-	@echo Linking the server $(ZSERVER)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(ZSERVER_LINK_OPTIONS)
-		/out:$(ZSERVER) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(ZSERVER_OBJS) 
-<<
-
-$(ZINDEX) : "$(BINDIR)" $(ZEBRAIDX_OBJS)  $(IMPLIB)
-	@echo Linking the indexer $(ZINDEX)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(ZINDEX_LINK_OPTIONS)
-		/out:$(ZINDEX) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(ZEBRAIDX_OBJS) 
-<<
-
-$(APITEST) : "$(BINDIR)" $(APITEST_OBJS) $(YAZLIBS)
-	@echo Linking the test program $(APITEST)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(APITEST_LINK_OPTIONS)
-		/out:$(APITEST) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(APITEST_OBJS)
-<<
-
-$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
-	@echo Linking the dll  $(DLL)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(LINK_LIBS) 
-		$(DLL_LINK_OPTIONS)
-		$(ZEBRALIB_OBJS)
-		/out:$(DLL) 
-		$(YAZLIBS)
-		/implib:"$(IMPLIB)"
-		/map:"$(LIBDIR)\idzebra.map"  
-<<
+	$(LINK_PROGRAM) $(ZSERVER_OBJS)  /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
+$(ZEBRAIDX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(IMPLIB)
+	$(LINK_PROGRAM) $(ZEBRAIDX_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
+$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
+	$(LINK_PROGRAM) $(TSTFLOCK_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
+# Resources
+RES=$(OBJDIR)\zebra.res
+RC=$(WINDIR)\zebra.rc
+
+RSC=rc.exe
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
 
-###########################################################
-############### Special operations
-###########################################################
+
+$(RES): $(RC)
+	$(RSC) $(RSOPT) /I"../include" /I"$(YAZDIR)\include" /fo"$(RES)" $(RC)
+
+$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
+	$(LINK) \
+		$(LNKOPT) \
+		$(LINK_LIBS) \
+		$(DLL_LINK_OPTIONS) \
+		$(ZEBRALIB_OBJS) \
+		$(RES) \
+		/out:$@ \
+		$(YAZLIB) \
+		/implib:"$(IMPLIB)" \
+		/map:"$(LIBDIR)\idzebra.map" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
+
+# Other rules
 
 clean:
 	-del $(OBJDIR)\*.obj
 	-del $(OBJDIR)\*.sbr
 	-del $(BINDIR)\*.exe
+	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
 	-del $(LIBDIR)\*.lib
 
-########### check directories and create if needed
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
@@ -560,14 +544,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-	copy $(YAZBINDIR)\*.dll $(BINDIR)
-
-###########################################################
-############### Explicit dependencies
-###########################################################
+#	copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR)
+	copy "$(YAZBINDIR)\*.dll" $(BINDIR)
 
-# $(ALL_OBJS): makefile
 
-# force recompilation of everything, if makefile changed
-
-###########################################################