X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=5e03c6e78313427e4b72425f17c999dd739b582c;hb=69b66fb0c3c17f6deca8ede6940355a2512f8957;hp=77955340c2b62226a29b5dbe480108bda3eb258e;hpb=e208cf170e7317da273f3eccdc48c5cf3f8e33f0;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 7795534..5e03c6e 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,11 +1,11 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.39 2006-02-09 09:20:23 adam Exp $
+# $Id: makefile,v 1.51 2006-06-07 14:37:02 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
@@ -15,7 +15,7 @@ EXPAT_DIR=c:\Expat-1.95.8
 HAVE_ICONV=1
 ICONV_DIR=c:\iconv-1.9.1.win32
 
-# libxslt. For xslt+alvis
+# libxslt. For alvis
 HAVE_LIBXSLT=1
 LIBXSLT_DIR=c:\libxslt-1.1.14.win32
 
@@ -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 
@@ -197,14 +199,25 @@ libxslt:
 
 !endif
 
+!if $(HAVE_LIBXSLT)
+MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
+MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
+!else
+MOD_ALVIS_OBJS=
+MOD_ALVIS_CFLAGS=
+!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   \
+  /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" \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
@@ -220,8 +233,7 @@ COMMON_C_OPTIONS=          \
   /DIDZEBRA_STATIC_GRS_REGX=1 \
   /DIDZEBRA_STATIC_GRS_MARC=1 \
   /DIDZEBRA_STATIC_GRS_DANBIB=1 \
-  /DIDZEBRA_STATIC_ALVIS=1 \
-  /DIDZEBRA_STATIC_XSLT=1 \
+  $(MOD_ALVIS_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -306,11 +318,14 @@ ZEBRAIDX_OBJS= \
 	$(OBJDIR)\main.obj 
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
+TSTFLOCK_OBJS= \
+	$(OBJDIR)\tstflock.obj
 
 ZEBRALIB_OBJS= \
-	$(OBJDIR)\alvis.obj \
+        $(MOD_ALVIS_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
+	$(OBJDIR)\attrfind.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
@@ -336,7 +351,6 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\d1_tagset.obj \
 	$(OBJDIR)\d1_varset.obj \
 	$(OBJDIR)\d1_write.obj \
-	$(OBJDIR)\danbibr.obj \
 	$(OBJDIR)\dclose.obj \
 	$(OBJDIR)\dcompact.obj \
 	$(OBJDIR)\delete.obj \
@@ -358,7 +372,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 \
@@ -370,6 +384,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\orddict.obj \
 	$(OBJDIR)\passwddb.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\ranksimilarity.obj \
 	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -398,11 +413,11 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
 	$(OBJDIR)\symtab.obj \
-	$(OBJDIR)\trav.obj \
+	$(OBJDIR)\update_path.obj \
+	$(OBJDIR)\update_file.obj \
 	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\xmlread.obj \
 	$(OBJDIR)\xpath.obj \
-	$(OBJDIR)\xslt.obj \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
@@ -410,7 +425,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\zvrank.obj
+	$(OBJDIR)\zvrank.obj 
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -514,6 +529,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) @<<
@@ -547,6 +576,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
+	copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
 	copy $(YAZBINDIR)\*.dll $(BINDIR)
 
 ###########################################################