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

diff --git a/win/makefile b/win/makefile
index 8b95933..5e03c6e 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.44 2006-05-19 13:49:38 adam Exp $
+# $Id: makefile,v 1.51 2006-06-07 14:37:02 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -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
 
@@ -202,13 +202,9 @@ libxslt:
 !if $(HAVE_LIBXSLT)
 MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
 MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
-MOD_XSLT_OBJS= $(OBJDIR)\xslt.obj
-MOD_XSLT_CFLAGS=/DIDZEBRA_STATIC_XSLT=1
 !else
 MOD_ALVIS_OBJS=
 MOD_ALVIS_CFLAGS=
-MOD_XSLT_OBJS=
-MOD_XSLT_CFLAGS=
 !endif
 
 ### C and CPP compiler  (the same thing)
@@ -219,7 +215,9 @@ 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" \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
@@ -236,7 +234,6 @@ COMMON_C_OPTIONS=          \
   /DIDZEBRA_STATIC_GRS_MARC=1 \
   /DIDZEBRA_STATIC_GRS_DANBIB=1 \
   $(MOD_ALVIS_CFLAGS) \
-  $(MOD_XSLT_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -326,7 +323,6 @@ TSTFLOCK_OBJS= \
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
-	$(MOD_XSLT_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\attrfind.obj \
@@ -355,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 \
@@ -389,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 \
@@ -417,7 +413,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 \
@@ -428,7 +425,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\zvrank.obj
+	$(OBJDIR)\zvrank.obj 
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -579,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)
 
 ###########################################################