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

diff --git a/win/makefile b/win/makefile
index 75c9b81..22d0802 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.41 2006-02-23 14:43:13 adam Exp $
+# $Id: makefile,v 1.43 2006-03-29 08:38:45 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -124,11 +124,13 @@ ZEBRA_RES=$(OBJDIR)\idzebra.res
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZINDEX=$(BINDIR)\zebraidx.exe
 APITEST=$(BINDIR)\apitest.exe
+TSTFLOCK=$(BINDIR)\tstflock.exe
 
 # shortcut names defined here
 zindex: $(ZINDEX)
 zserver: $(ZSERVER)
 apitest: $(APITEST)
+tstflock: $(TSTFLOCK)
 dll: $(DLL) 
 ###########################################################
 ############### Compiler and linker options 
@@ -200,13 +202,13 @@ libxslt:
 !if $(HAVE_LIBXSLT)
 MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
 MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
-MOD_ALVIS_OBJS= $(OBJDIR)\xslt.obj
-MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_XSLT=1
+MOD_XSLT_OBJS= $(OBJDIR)\xslt.obj
+MOD_XSLT_CFLAGS=/DIDZEBRA_STATIC_XSLT=1
 !else
 MOD_ALVIS_OBJS=
 MOD_ALVIS_CFLAGS=
-MOD_ALVIS_OBJS=
-MOD_ALVIS_CFLAGS=
+MOD_XSLT_OBJS=
+MOD_XSLT_CFLAGS=
 !endif
 
 ### C and CPP compiler  (the same thing)
@@ -319,6 +321,8 @@ ZEBRAIDX_OBJS= \
 	$(OBJDIR)\main.obj 
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
+TSTFLOCK_OBJS= \
+	$(OBJDIR)\tstflock.obj
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
@@ -372,7 +376,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\kcontrol.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\limit.obj \
-	$(OBJDIR)\lockutil.obj \
+	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
@@ -527,6 +531,20 @@ $(APITEST) : "$(BINDIR)" $(APITEST_OBJS) $(YAZLIBS)
 		$(APITEST_OBJS)
 <<
 
+$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS)  $(IMPLIB)
+	@echo Linking $(TSTFLOCK)
+	$(LINK) @<<
+		$(LNKOPT) 
+		$(TSTFLOCK_LINK_OPTIONS)
+		/out:$(TSTFLOCK) 
+		$(IMPLIB)
+		$(YAZLIBS)
+		$(BZIP2LIB)
+		$(LINK_LIBS) 
+		$(TSTFLOCK_OBJS) 
+<<
+
+
 $(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
 	@echo Linking the dll  $(DLL)
 	$(LINK) @<<