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

diff --git a/win/makefile b/win/makefile
index 58554bb..4768219 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,11 +1,12 @@
-# Z'mbol makefile for MS NMAKE
-# $Id: makefile,v 1.1 1999-12-08 22:11:56 adam Exp $
+# Z'mbol/Zebra makefile for MS NMAKE
+# $Id: makefile,v 1.6 2000-05-23 21:28:03 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
+ZMBOL=1
 
 default: all
 
@@ -22,8 +23,7 @@ ROOTDIR=..   # The home of Z'mbol
 YAZDIR=$(ROOTDIR)\..\YAZ
 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
 
@@ -66,8 +66,13 @@ TEMP=$(TMPDIR)
 ###########################################################
 
 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
@@ -91,7 +96,7 @@ COMMON_C_OPTIONS=          \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
-  /D"ZMBOL=1"              \
+  /D"ZMBOL=$(ZMBOL)"       \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -170,6 +175,7 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 # need to be specified, though
 
 ZSERVER_OBJS= \
+	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\zserver.obj 
 
 ZEBRAIDX_OBJS= \
@@ -183,7 +189,23 @@ ZEBRAIDX_OBJS= \
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
 
+!if $(ZMBOL)
+ZMBOLLIB_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
+!else
+ZMBOLLIB_OBJS=
+!endif
 ZEBRALIB_OBJS= \
+    $(ZMBOLLIB_OBJS) \
+	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
@@ -202,10 +224,6 @@ 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 \
@@ -214,13 +232,9 @@ ZEBRALIB_OBJS= \
 	$(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 \
@@ -231,7 +245,6 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\regxread.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
-	$(OBJDIR)\rootblk.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
 	$(OBJDIR)\rsisam.obj \
@@ -313,7 +326,7 @@ ALL_OBJS=\
 ###########################################################
 
 $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(ZEBRALIB) $(YAZLIBS)
-	@echo Linking the zmbol server  $(ZSERVER)
+	@echo Linking the server $(ZSERVER)
 	$(LINK) @<<
 		$(LNKOPT) 
 		$(ZSERVER_LINK_OPTIONS)
@@ -326,7 +339,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 +361,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) 
@@ -382,7 +395,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 ############### Explicit dependencies
 ###########################################################
 
-$(ALL_OBJS): zmbol.mak
+$(ALL_OBJS): makefile
 
 # force recompilation of everything, if makefile changed
 
@@ -391,7 +404,22 @@ $(ALL_OBJS): zmbol.mak
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.1  1999-12-08 22:11:56  adam
+# Revision 1.6  2000-05-23 21:28:03  adam
+# Combined zebra/zmbol makefile.
+#
+# Revision 1.5  2000/05/05 13:48:03  adam
+# Fixed locking for metafiles.
+#
+# Revision 1.4  2000/04/19 14:35:59  adam
+# WIN32 update (this version is known not to work on Windows).
+#
+# Revision 1.3  2000/04/17 14:22:00  adam
+# WIN32 update.
+#
+# Revision 1.2  2000/02/08 12:34:17  adam
+# Fix: referred to zmbol.mak.
+#
+# 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