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

diff --git a/win/makefile b/win/makefile
index 4bd9aa7..f84fb9b 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,23 +1,30 @@
-# Z'mbol/Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.9 2002-03-21 10:31:54 adam Exp $
+# Zebra makefile for MS NMAKE
+# $Id: makefile,v 1.37 2005-08-25 12:46:17 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
-ZMBOL=1
+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.8
+
+# iconv is optional
+HAVE_ICONV=1
+ICONV_DIR=c:\iconv-1.9.1.win32
 
 default: all
 
-all: dirs zebralib zserver zindex
+all: dirs iconv zebralib zserver zindex 
 
 ###########################################################
 ############### Directories
 ###########################################################
 # The current directory is supposed to be something like
 # ..../Zebra/Win, everything is relative to that
-ROOTDIR=..   # The home of Z'mbol
+ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
 YAZDIR=$(ROOTDIR)\..\YAZ
@@ -25,7 +32,8 @@ YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
 YAZBINDIR=$(YAZDIR)\bin
-YAZDLL=$(YAZBINDIR)\yaz.dll
+YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
+YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
 # (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
@@ -50,9 +58,11 @@ DICTDIR=$(SRCDIR)\DICT
 ISAMSDIR=$(SRCDIR)\ISAMS
 ISAMDIR=$(SRCDIR)\ISAM
 ISAMCDIR=$(SRCDIR)\ISAMC
+ISAMBDIR=$(SRCDIR)\ISAMB
 RECCTRLDIR=$(SRCDIR)\RECCTRL
 RSETDIR=$(SRCDIR)\RSET
 UTILDIR=$(SRCDIR)\UTIL
+DATA1DIR=$(SRCDIR)\DATA1
 APITESTDIR=$(SRCDIR)\APITEST
 
 # Force temp files in a local temp, easier to clean
@@ -61,18 +71,25 @@ 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
 ###########################################################
 
 ZEBRALIB=$(LIBDIR)\zebra.lib
-!if $(ZMBOL)
-ZSERVER=$(BINDIR)\zmbolsrv.exe
-ZINDEX=$(BINDIR)\zmbolidx.exe
-!else
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZINDEX=$(BINDIR)\zebraidx.exe
-!endif
 APITEST=$(BINDIR)\apitest.exe
 
 # shortcut names defined here
@@ -85,6 +102,33 @@ apitest: $(APITEST)
 ############### Compiler and linker options 
 ###########################################################
 
+!if $(HAVE_EXPAT)
+EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
+EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
+EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
+EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
+	copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
+!else
+EXPAT_DEF= /D HAVE_EXPAT_H=0
+EXPAT_LIB=
+EXPAT_DLL_SOURCE=
+EXPAT_DLL_TARGET=
+!endif
+
+!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)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
@@ -93,10 +137,18 @@ COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   /D "WIN32"               \
   /D"_CONSOLE" /D"_MBCS"   \
+  $(ICONV_DEF)             \
+  $(EXPAT_DEF)             \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
-  /D"ZMBOL=$(ZMBOL)"       \
+  /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= \
@@ -134,23 +186,19 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib
-
-COMMON_LNK_OPTIONS= /nologo \
-                    /machine:i386 \
-				    /incremental:no
+           wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
-#                    /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)
@@ -182,28 +230,16 @@ ZEBRAIDX_OBJS= \
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
 
-!if $(ZMBOL)
-ZMBOLLIB_OBJS= \
-	$(OBJDIR)\isam.obj \
+ZEBRALIB_OBJS= \
 	$(OBJDIR)\isamc.obj \
-	$(OBJDIR)\isamd.obj \
-	$(OBJDIR)\isutil.obj \
-	$(OBJDIR)\memory.obj \
 	$(OBJDIR)\merge.obj \
-	$(OBJDIR)\merge-d.obj \
-	$(OBJDIR)\physical.obj \
-	$(OBJDIR)\rootblk.obj
-!else
-ZMBOLLIB_OBJS=
-!endif
-ZEBRALIB_OBJS= \
-    $(ZMBOLLIB_OBJS) \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
 	$(OBJDIR)\charmap.obj \
+	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\close.obj \
 	$(OBJDIR)\commit.obj \
 	$(OBJDIR)\compact.obj \
@@ -223,10 +259,14 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
 	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\marcomp.obj \
+	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
 	$(OBJDIR)\passwddb.obj \
+	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -234,13 +274,14 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\recstat.obj \
 	$(OBJDIR)\rectext.obj \
 	$(OBJDIR)\regxread.obj \
+	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\danbibr.obj \
 	$(OBJDIR)\res.obj \
 	$(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 \
@@ -252,17 +293,43 @@ 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)\rsisamd.obj \
+	$(OBJDIR)\isamb.obj \
+	$(OBJDIR)\rsisamb.obj \
+	$(OBJDIR)\rsbetween.obj \
+	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\dir.obj \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\extract.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\rsisams.obj \
-	$(OBJDIR)\trav.obj
+	$(OBJDIR)\trav.obj \
+	$(OBJDIR)\d1_absyn.obj \
+	$(OBJDIR)\d1_attset.obj \
+	$(OBJDIR)\d1_doespec.obj \
+	$(OBJDIR)\d1_espec.obj \
+	$(OBJDIR)\d1_expout.obj \
+	$(OBJDIR)\d1_grs.obj \
+	$(OBJDIR)\d1_handle.obj \
+	$(OBJDIR)\d1_if.obj \
+	$(OBJDIR)\d1_map.obj \
+	$(OBJDIR)\d1_marc.obj \
+	$(OBJDIR)\d1_prtree.obj \
+	$(OBJDIR)\d1_read.obj \
+	$(OBJDIR)\d1_soif.obj \
+	$(OBJDIR)\d1_sumout.obj \
+	$(OBJDIR)\d1_sutrs.obj \
+	$(OBJDIR)\d1_tagset.obj \
+	$(OBJDIR)\d1_varset.obj \
+	$(OBJDIR)\d1_write.obj \
+	$(OBJDIR)\xpath.obj \
+	$(OBJDIR)\kcontrol.obj \
+	$(OBJDIR)\limit.obj \
+	$(OBJDIR)\snippet.obj
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -278,45 +345,50 @@ ALL_OBJS=\
 # source files. Funny way of doing it, but it works.
 
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $<
+	$(CPP) $(COPT) $<
 
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $<
+	$(CPP) $(COPT) $<
 
 # ZebraLib
 {$(INDEXDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(BFILEDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(DFADIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(DICTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(ISAMSDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(ISAMDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(ISAMCDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
+
+{$(ISAMBDIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
 
 {$(RECCTRLDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(RSETDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
-{$(APITESTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+{$(DATA1DIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
 
+{$(APITESTDIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
 
 ###########################################################
 ############### Linking
@@ -378,14 +450,18 @@ clean:
 	-del $(OBJDIR)\*.sbr
 	-del $(BINDIR)\*.exe
 	-del $(TMPDIR)\*.
-	-del $(ZEBRALIB)
+	-del $(LIBDIR)\*.lib
 
 ########### check directories and create if needed
-dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
+dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) \
+	$(EXPAT_DLL_TARGET) $(YAZ_DLL_TARGET)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
  	if not exist "$@/$(NUL)" mkdir "$@"
 
+$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
+	copy $(YAZBINDIR)\*.dll $(BINDIR)
+
 ###########################################################
 ############### Explicit dependencies
 ###########################################################