Modified to work with non-blocking zass-api. Not using non-blocking

[egate.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 3b07766..5686bc5 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,11 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.20  1995/04/20 15:24:59  quinn
+# Revision 1.21  1995/04/20 16:10:45  adam
+# Modified to work with non-blocking zass-api. Not using non-blocking
+# facility yet.
+#
+# Revision 1.20  1995/04/20  15:24:59  quinn
 # *** empty log message ***
 #
 # Revision 1.19  1995/04/19  16:08:20  adam
@@ -69,21 +73,11 @@
 #
 SHELL=/bin/sh
 
-<<<<<<< 1.19
-ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
-ZINC=-I$(ZPRE)
-ZLIB=$(ZPRE)/libz3950.a
-=======
 #ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
 #ZINC=-I$(ZPRE)
 #ZLIB=$(ZPRE)/libz3950.a
->>>>>>> /tmp/T4a18061
 
-<<<<<<< 1.19
-#ZLIB=../../yaz/lib/libyaz.a
-=======
 ZLIB=../../yaz/lib/libyaz.a
->>>>>>> /tmp/T4a18061
 
 INCLUDE=-I../include
 #CFLAGS=-g -Wall