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

diff --git a/win/makefile b/win/makefile
index 94dbb20..f84fb9b 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.27 2004-08-06 12:27:30 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
@@ -27,7 +27,7 @@ all: dirs zebralib zserver zindex
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ-2.0.22
+YAZDIR=$(ROOTDIR)\..\YAZ
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -71,6 +71,18 @@ TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 TEMP=$(TMPDIR)
 
+# NSIS
+NSIS="c:\program files\nsis\makensis.exe"
+
+dist:
+	nmake DEBUG=1 clean
+	nmake DEBUG=0 clean
+	nmake DEBUG=0
+	$(NSIS) zebra.nsi
+
+nsis:
+	$(NSIS) zebra.nsi
+
 ###########################################################
 ############### Targets - what to make
 ###########################################################
@@ -107,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)
@@ -126,6 +143,12 @@ COMMON_C_OPTIONS=          \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
   /DDEFAULT_PROFILE_PATH=0 \
+  /DDEFAULT_MODULE_PATH=0  \
+  /DIDZEBRA_STATIC_GRS_SGML=1 \
+  /DIDZEBRA_STATIC_TEXT=1  \
+  /DIDZEBRA_STATIC_GRS_XML=1 \
+  /DIDZEBRA_STATIC_GRS_REGX=1 \
+  /DIDZEBRA_STATIC_GRS_MARC=1 \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -165,21 +188,17 @@ LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
            wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo \
-                    /machine:i386 \
-				    /incremental:no
-
-#                    /subsystem:windows \
+COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
-RELEASE_LNK_OPTIONS=  /pdb:none
+RELEASE_LNK_OPTIONS= 
 
-ZEBRALIB_LINK_OPTIONS = -lib 
+ZEBRALIB_LINK_OPTIONS= -lib 
 
-ZSERVER_LINK_OPTIONS = /subsystem:console  
-ZINDEX_LINK_OPTIONS = /subsystem:console  
-APITEST_LINK_OPTIONS = /subsystem:console  
+ZSERVER_LINK_OPTIONS= /subsystem:console  
+ZINDEX_LINK_OPTIONS= /subsystem:console  
+APITEST_LINK_OPTIONS= /subsystem:console  
 
 # Final opt variables
 !if $(DEBUG)
@@ -212,13 +231,8 @@ APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
 
 ZEBRALIB_OBJS= \
-	$(OBJDIR)\isam.obj \
 	$(OBJDIR)\isamc.obj \
-	$(OBJDIR)\isutil.obj \
-	$(OBJDIR)\memory.obj \
 	$(OBJDIR)\merge.obj \
-	$(OBJDIR)\physical.obj \
-	$(OBJDIR)\rootblk.obj \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\bfile.obj \
@@ -252,7 +266,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\passwddb.obj \
 	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
-	$(OBJDIR)\livcode.obj \
+	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -266,9 +280,8 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\retrieve.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
-	$(OBJDIR)\rsisam.obj \
 	$(OBJDIR)\rsisamc.obj \
-	$(OBJDIR)\rsm_or.obj \
+	$(OBJDIR)\rsmultiandor.obj \
 	$(OBJDIR)\rsnull.obj \
 	$(OBJDIR)\rstemp.obj \
 	$(OBJDIR)\scan.obj \
@@ -280,12 +293,12 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
+	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zinfo.obj \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
 	$(OBJDIR)\isams.obj \
 	$(OBJDIR)\isamb.obj \
-	$(OBJDIR)\rsisamd.obj \
 	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsprox.obj \
@@ -313,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) \
@@ -433,7 +449,6 @@ clean:
 	-del $(OBJDIR)\*.obj
 	-del $(OBJDIR)\*.sbr
 	-del $(BINDIR)\*.exe
-	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
 	-del $(LIBDIR)\*.lib
 
@@ -445,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