X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b05dc8fcbf4add3f7a4a3fa49ac6f797c380cabb;hb=fc83d98d346711f446d9f9a29cc2ff0eee398053;hp=1a43b36e306c4b02a79ab3a7b4a0799dab04159d;hpb=ce6df1eaab07d33544975ffe67a4b7a231cf795a;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 1a43b36..b05dc8f 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.42 2006-03-23 12:07:13 adam Exp $
+# $Id: makefile,v 1.48 2006-05-30 13:21:21 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -202,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)
@@ -219,6 +219,7 @@ COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
   /D "WIN32"               \
   /D"_CONSOLE" /D"_MBCS"   \
+  /DYAZ_USE_NEW_LOG=1      \
   /D"_CRT_SECURE_NO_DEPRECATE" \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
@@ -329,6 +330,7 @@ ZEBRALIB_OBJS= \
 	$(MOD_XSLT_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
+	$(OBJDIR)\attrfind.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
@@ -388,6 +390,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\orddict.obj \
 	$(OBJDIR)\passwddb.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\ranksimilarity.obj \
 	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -416,7 +419,8 @@ 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 \
@@ -427,7 +431,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\zvrank.obj
+	$(OBJDIR)\zvrank.obj 
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \