X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=1bc68c8c33c1ee060ddfc158d96a760417dbbb70;hb=c1a85f9caaa8476a69b392349e90b7c4981e7db3;hp=58554bb84cfd9d4065ac12e5d2f59a2dac0f84ae;hpb=075d0e660334b9baf35c65e3da596b465057e2bf;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 58554bb..1bc68c8 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,11 +1,11 @@
 # Z'mbol makefile for MS NMAKE
-# $Id: makefile,v 1.1 1999-12-08 22:11:56 adam Exp $
+# $Id: makefile,v 1.5 2000-05-05 13:48:03 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
 
 default: all
 
@@ -22,8 +22,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
 
@@ -170,6 +169,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= \
@@ -184,6 +184,7 @@ APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
 
 ZEBRALIB_OBJS= \
+	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
@@ -382,7 +383,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 ############### Explicit dependencies
 ###########################################################
 
-$(ALL_OBJS): zmbol.mak
+$(ALL_OBJS): makefile
 
 # force recompilation of everything, if makefile changed
 
@@ -391,7 +392,19 @@ $(ALL_OBJS): zmbol.mak
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.1  1999-12-08 22:11:56  adam
+# 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