X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8b959331b0cf22f0566ca894b3f685b0849fff32;hp=144d2906d3f2b879ae78d579528a4ac5c846c933;hb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;hpb=8ca3d9cf56031e19b8368b1f82279bf02c7dadac

diff --git a/win/makefile b/win/makefile
index 144d290..8b95933 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,11 +1,11 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.38 2005-08-30 12:25:38 adam Exp $
+# $Id: makefile,v 1.44 2006-05-19 13:49:38 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
@@ -124,11 +124,13 @@ ZEBRA_RES=$(OBJDIR)\idzebra.res
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZINDEX=$(BINDIR)\zebraidx.exe
 APITEST=$(BINDIR)\apitest.exe
+TSTFLOCK=$(BINDIR)\tstflock.exe
 
 # shortcut names defined here
 zindex: $(ZINDEX)
 zserver: $(ZSERVER)
 apitest: $(APITEST)
+tstflock: $(TSTFLOCK)
 dll: $(DLL) 
 ###########################################################
 ############### Compiler and linker options 
@@ -197,14 +199,27 @@ libxslt:
 
 !endif
 
+!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)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c \
   /D "WIN32"               \
   /D"_CONSOLE" /D"_MBCS"   \
+  /D"_CRT_SECURE_NO_DEPRECATE" \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
@@ -220,8 +235,8 @@ COMMON_C_OPTIONS=          \
   /DIDZEBRA_STATIC_GRS_REGX=1 \
   /DIDZEBRA_STATIC_GRS_MARC=1 \
   /DIDZEBRA_STATIC_GRS_DANBIB=1 \
-  /DIDZEBRA_STATIC_ALVIS=1 \
-  /DIDZEBRA_STATIC_XSLT=1 \
+  $(MOD_ALVIS_CFLAGS) \
+  $(MOD_XSLT_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -306,109 +321,114 @@ ZEBRAIDX_OBJS= \
 	$(OBJDIR)\main.obj 
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
+TSTFLOCK_OBJS= \
+	$(OBJDIR)\tstflock.obj
 
 ZEBRALIB_OBJS= \
-	$(OBJDIR)\isamc.obj \
-	$(OBJDIR)\merge.obj \
-	$(OBJDIR)\zebra-lock.obj \
+        $(MOD_ALVIS_OBJS) \
+	$(MOD_XSLT_OBJS) \
+	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
+	$(OBJDIR)\attrfind.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 \
+	$(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)\danbibr.obj \
 	$(OBJDIR)\dclose.obj \
 	$(OBJDIR)\dcompact.obj \
 	$(OBJDIR)\delete.obj \
 	$(OBJDIR)\dfa.obj \
+	$(OBJDIR)\dir.obj \
 	$(OBJDIR)\dirent.obj \
+	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\dopen.obj \
 	$(OBJDIR)\drdwr.obj \
+	$(OBJDIR)\extract.obj \
 	$(OBJDIR)\imalloc.obj \
+	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\insert.obj \
 	$(OBJDIR)\invstat.obj \
+	$(OBJDIR)\isamb.obj \
+	$(OBJDIR)\isamc.obj \
+	$(OBJDIR)\isams.obj \
 	$(OBJDIR)\kcompare.obj \
-	$(OBJDIR)\lockutil.obj \
+	$(OBJDIR)\kcontrol.obj \
+	$(OBJDIR)\kinput.obj \
+	$(OBJDIR)\limit.obj \
+	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
-	$(OBJDIR)\marcread.obj \
 	$(OBJDIR)\marcomp.obj \
-	$(OBJDIR)\inline.obj \
+	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\merge.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
+	$(OBJDIR)\orddict.obj \
 	$(OBJDIR)\passwddb.obj \
-	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
 	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
 	$(OBJDIR)\recindex.obj \
+	$(OBJDIR)\reckeys.obj \
 	$(OBJDIR)\recstat.obj \
 	$(OBJDIR)\rectext.obj \
 	$(OBJDIR)\regxread.obj \
-	$(OBJDIR)\xmlread.obj \
-	$(OBJDIR)\alvis.obj \
-	$(OBJDIR)\xslt.obj \
-	$(OBJDIR)\danbibr.obj \
-	$(OBJDIR)\safari.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
+	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
+	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsisamc.obj \
+	$(OBJDIR)\rsisams.obj \
 	$(OBJDIR)\rsmultiandor.obj \
 	$(OBJDIR)\rsnull.obj \
+	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\rstemp.obj \
+	$(OBJDIR)\safari.obj \
 	$(OBJDIR)\scan.obj \
 	$(OBJDIR)\set.obj \
 	$(OBJDIR)\sgmlread.obj \
+	$(OBJDIR)\snippet.obj \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
 	$(OBJDIR)\symtab.obj \
+	$(OBJDIR)\trav.obj \
 	$(OBJDIR)\trunc.obj \
+	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\xpath.obj \
+	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
-	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zinfo.obj \
+	$(OBJDIR)\zint.obj \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\isams.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)\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
+	$(OBJDIR)\zvrank.obj
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -512,6 +532,20 @@ $(APITEST) : "$(BINDIR)" $(APITEST_OBJS) $(YAZLIBS)
 		$(APITEST_OBJS)
 <<
 
+$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS)  $(IMPLIB)
+	@echo Linking $(TSTFLOCK)
+	$(LINK) @<<
+		$(LNKOPT) 
+		$(TSTFLOCK_LINK_OPTIONS)
+		/out:$(TSTFLOCK) 
+		$(IMPLIB)
+		$(YAZLIBS)
+		$(BZIP2LIB)
+		$(LINK_LIBS) 
+		$(TSTFLOCK_OBJS) 
+<<
+
+
 $(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
 	@echo Linking the dll  $(DLL)
 	$(LINK) @<<