X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=74bd2b63cd3ede310b74bebae8b681499584c509;hb=ffb6aaba033b87c9e2e4d32e1f84f88bc6679e1f;hp=58554bb84cfd9d4065ac12e5d2f59a2dac0f84ae;hpb=075d0e660334b9baf35c65e3da596b465057e2bf;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 58554bb..74bd2b6 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
-# Z'mbol makefile for MS NMAKE
-# $Id: makefile,v 1.1 1999-12-08 22:11:56 adam Exp $
+# Zebra makefile for MS NMAKE
+# $Id: makefile,v 1.21 2003-02-23 22:52:15 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -7,6 +7,14 @@
 
 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.4
+
+# iconv is optional
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.8.win32
+
 default: all
 
 all: dirs zebralib zserver zindex
@@ -16,16 +24,16 @@ all: dirs zebralib zserver zindex
 ###########################################################
 # 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
+YAZDIR=$(ROOTDIR)\..\YAZ-2.0
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZSERVLIB=$(YAZDIR)\lib\server.lib
-YAZLIBS=$(YAZLIB) $(YAZSERVLIB)
+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
@@ -66,8 +76,8 @@ TEMP=$(TMPDIR)
 ###########################################################
 
 ZEBRALIB=$(LIBDIR)\zebra.lib
-ZSERVER=$(BINDIR)\zmbolsrv.exe
-ZINDEX=$(BINDIR)\zmbolidx.exe
+ZSERVER=$(BINDIR)\zebrasrv.exe
+ZINDEX=$(BINDIR)\zebraidx.exe
 APITEST=$(BINDIR)\apitest.exe
 
 # shortcut names defined here
@@ -80,6 +90,28 @@ 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
+!else
+ICONV_DEF= /D HAVE_ICONV_H=0
+ICONV_LIB=
+!endif
+
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
@@ -88,10 +120,12 @@ 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=1"              \
+  /DDEFAULT_PROFILE_PATH=0 \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -129,7 +163,7 @@ 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
+           wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /machine:i386 \
@@ -173,17 +207,21 @@ ZSERVER_OBJS= \
 	$(OBJDIR)\zserver.obj 
 
 ZEBRAIDX_OBJS= \
-	$(OBJDIR)\dir.obj \
-	$(OBJDIR)\dirs.obj \
-	$(OBJDIR)\extract.obj \
-	$(OBJDIR)\kinput.obj \
-	$(OBJDIR)\main.obj \
-	$(OBJDIR)\trav.obj
-
+	$(OBJDIR)\main.obj 
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
 
 ZEBRALIB_OBJS= \
+	$(OBJDIR)\isam.obj \
+	$(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 \
+	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
@@ -202,25 +240,15 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\imalloc.obj \
 	$(OBJDIR)\insert.obj \
 	$(OBJDIR)\invstat.obj \
-	$(OBJDIR)\isam.obj \
-	$(OBJDIR)\isamc.obj \
-	$(OBJDIR)\isamd.obj \
-	$(OBJDIR)\isutil.obj \
 	$(OBJDIR)\kcompare.obj \
-	$(OBJDIR)\lockidx.obj \
-	$(OBJDIR)\locksrv.obj \
 	$(OBJDIR)\lockutil.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
 	$(OBJDIR)\marcread.obj \
-	$(OBJDIR)\memory.obj \
-	$(OBJDIR)\merge.obj \
-	$(OBJDIR)\merge-d.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
 	$(OBJDIR)\passwddb.obj \
-	$(OBJDIR)\physical.obj \
 	$(OBJDIR)\rank1.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
@@ -229,9 +257,9 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\recstat.obj \
 	$(OBJDIR)\rectext.obj \
 	$(OBJDIR)\regxread.obj \
+	$(OBJDIR)\xmlread.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
-	$(OBJDIR)\rootblk.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
 	$(OBJDIR)\rsisam.obj \
@@ -252,7 +280,35 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
 	$(OBJDIR)\isams.obj \
-	$(OBJDIR)\rsisams.obj 
+	$(OBJDIR)\isamb.obj \
+	$(OBJDIR)\rsisamd.obj \
+	$(OBJDIR)\rsisamb.obj \
+	$(OBJDIR)\rsbetween.obj \
+	$(OBJDIR)\dir.obj \
+	$(OBJDIR)\dirs.obj \
+	$(OBJDIR)\extract.obj \
+	$(OBJDIR)\kinput.obj \
+	$(OBJDIR)\rsisams.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
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -268,52 +324,57 @@ 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
 ###########################################################
 
 $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(ZEBRALIB) $(YAZLIBS)
-	@echo Linking the zmbol server  $(ZSERVER)
+	@echo Linking the server $(ZSERVER)
 	$(LINK) @<<
 		$(LNKOPT) 
 		$(ZSERVER_LINK_OPTIONS)
@@ -326,7 +387,7 @@ $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(ZEBRALIB) $(YAZLIBS)
 <<
 
 $(ZINDEX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(ZEBRALIB) $(YAZLIBS)
-	@echo Linking the zmbol indexer  $(ZINDEX)
+	@echo Linking the indexer $(ZINDEX)
 	$(LINK) @<<
 		$(LNKOPT) 
 		$(ZINDEX_LINK_OPTIONS)
@@ -348,11 +409,11 @@ $(APITEST) : "$(BINDIR)" $(APITEST_OBJS) $(ZEBRALIB) $(YAZLIBS)
 		$(ZEBRALIB)
 		$(BZIP2LIB)
 		$(LINK_LIBS) 
-		$(APITEST_OBJS) 
+		$(APITEST_OBJS)
 <<
 
 $(ZEBRALIB) : "$(BINDIR)" $(ZEBRALIB_OBJS) 
-	@echo Linking zebra/zmbol library  $(ZEBRALIB)
+	@echo Linking library  $(ZEBRALIB)
 	$(LINK) $(ZEBRALIB_LINK_OPTIONS) @<<
 		/nologo
 		$(ZEBRALIB_OBJS) 
@@ -364,39 +425,29 @@ $(ZEBRALIB) : "$(BINDIR)" $(ZEBRALIB_OBJS)
 ###########################################################
 
 clean:
-	del $(OBJDIR)\*.obj
-	del $(OBJDIR)\*.sbr
-	del $(APITEST)
-	del $(ZINDEX)
-	del $(ZSERVER)
-	del $(TMPDIR)\*.
-	del $(ZEBRALIB)
+	-del $(OBJDIR)\*.obj
+	-del $(OBJDIR)\*.sbr
+	-del $(BINDIR)\*.exe
+	-del $(BINDIR)\*.dll
+	-del $(TMPDIR)\*.
+	-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 $(YAZ_DLL_SOURCE) $(YAZ_DLL_TARGET)
+
 ###########################################################
 ############### Explicit dependencies
 ###########################################################
 
-$(ALL_OBJS): zmbol.mak
+# $(ALL_OBJS): makefile
 
 # force recompilation of everything, if makefile changed
 
 ###########################################################
-############### Log
-###########################################################
-#
-# $Log: makefile,v $
-# Revision 1.1  1999-12-08 22:11:56  adam
-# Separate WIN32 sub directories for Zebra and Z'mbol.
-#
-# Revision 1.1  1999/12/02 10:26:49  adam
-# Added zmbol makefile.
-#
-#
-
-