X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=f84fb9bae1a613b511ff7f2ed2c19dd997eba41f;hb=78f51742e3b066955a13167346413627be644643;hp=99d2bfe1883fadf146c45a0e13c52c6cc6774f4e;hpb=6989551b965aea847612bdaf4988bc8c36ba8627;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 99d2bfe..f84fb9b 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.31 2005-01-15 13:18:17 adam Exp $
+# $Id: makefile,v 1.37 2005-08-25 12:46:17 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -9,15 +9,15 @@ DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.7
+EXPAT_DIR=c:\Expat-1.95.8
 
 # iconv is optional
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR=c:\iconv-1.9.1.win32
 
 default: all
 
-all: dirs zebralib zserver zindex
+all: dirs iconv zebralib zserver zindex 
 
 ###########################################################
 ############### Directories
@@ -119,9 +119,14 @@ EXPAT_DLL_TARGET=
 !if $(HAVE_ICONV)
 ICONV_DEF= /D HAVE_ICONV_H=1 /I"$(ICONV_DIR)\include"
 ICONV_LIB= $(ICONV_DIR)\lib\iconv.lib
+iconv: $(BINDIR)\iconv.dll
+
+$(BINDIR)\iconv.dll:
+	copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
 !else
 ICONV_DEF= /D HAVE_ICONV_H=0
 ICONV_LIB=
+iconv:
 !endif
 
 ### C and CPP compiler  (the same thing)
@@ -261,6 +266,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\passwddb.obj \
 	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -287,6 +293,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
+	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zinfo.obj \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
@@ -319,7 +326,10 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\d1_tagset.obj \
 	$(OBJDIR)\d1_varset.obj \
 	$(OBJDIR)\d1_write.obj \
-	$(OBJDIR)\xpath.obj
+	$(OBJDIR)\xpath.obj \
+	$(OBJDIR)\kcontrol.obj \
+	$(OBJDIR)\limit.obj \
+	$(OBJDIR)\snippet.obj
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -450,7 +460,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
  	if not exist "$@/$(NUL)" mkdir "$@"
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-	copy $(YAZ_DLL_SOURCE) $(YAZ_DLL_TARGET)
+	copy $(YAZBINDIR)\*.dll $(BINDIR)
 
 ###########################################################
 ############### Explicit dependencies