X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=4156dd0faa9a57f36114539dd1f798d493045ee7;hp=749d9e6a77956484fcb977bff724612a9de324e1;hb=11edef8271df7f3598f94373720aea3a5b6b3ad5;hpb=68df4151853ed44cb353f8a03c97822423284d6a

diff --git a/win/makefile b/win/makefile
index 749d9e6..4156dd0 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.47 2006-05-19 17:33:18 adam Exp $
+# $Id: makefile,v 1.52 2006-06-13 20:09:54 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)
@@ -221,6 +217,7 @@ COMMON_C_OPTIONS=          \
   /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)           \
@@ -237,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)
 
@@ -327,7 +323,6 @@ TSTFLOCK_OBJS= \
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
-	$(MOD_XSLT_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\attrfind.obj \
@@ -356,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 \
@@ -419,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 \
@@ -429,8 +424,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\zinfo.obj \
 	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zrpn.obj \
-	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\zvrank.obj 
+	$(OBJDIR)\zsets.obj
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -581,6 +575,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)
 
 ###########################################################