X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=kernel%2FMakefile;h=7d8d3e60fc8db6367683a521bdf2cc3a6554f65f;hb=7b58e36bc4c5a57dec46408bbfb3707638dd967a;hp=3b0776655fd35a0f2a8d60fd741d9477b99b5f84;hpb=7dcd55800b587a1e12dd8b6cb9209dfe38be32e3;p=egate.git

diff --git a/kernel/Makefile b/kernel/Makefile
index 3b07766..7d8d3e6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,39 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.20  1995/04/20 15:24:59  quinn
+# Revision 1.30  1996/05/31 08:02:26  adam
+# Minor changes.
+#
+# Revision 1.29  1996/05/22 08:37:21  adam
+# Removed CFLAGS definition.
+#
+# Revision 1.28  1996/01/24 08:28:07  adam
+# Fix.
+#
+# Revision 1.27  1995/07/05  10:20:06  adam
+# Z definitions duplicated from ../Makefile.
+#
+# Revision 1.26  1995/07/03  08:20:12  adam
+# More help information and better diagnostics.
+#
+# Revision 1.25  1995/05/19  13:25:58  adam
+# Bug fixes. Better command line options.
+#
+# Revision 1.24  1995/05/03  12:18:46  adam
+# This code ran on dtbsun. Minor changes.
+#
+# Revision 1.23  1995/05/03  07:37:29  adam
+# CCL commands stop/continue implemented. New functions gw_res_{int,bool}
+# are used when possible.
+#
+# Revision 1.22  1995/05/01  12:43:26  adam
+# First work on resource monitor program.
+#
+# 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,49 +101,44 @@
 #
 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
-=======
+ZINC=-I../../yaz/include
 ZLIB=../../yaz/lib/libyaz.a
->>>>>>> /tmp/T4a18061
+ZDEFS=
 
 INCLUDE=-I../include
-#CFLAGS=-g -Wall 
 CPP=$(CC) -E
 DEFS=$(INCLUDE) -DUSE_FML=1
-USELIBS1=../lib/ccl.a ../lib/fml.a ../lib/libzass.a ../lib/libres+log.a \
-../lib/util.a $(ZLIB) $(REGEXOBJ)
 
 PROG1=kernel
 O1=main.o urp.o persist.o
+USELIBS1=../lib/ccl.a ../lib/fml.a ../lib/libzass.a ../lib/libres+log.a \
+../lib/util.a $(REGEXOBJ)
 
 PROG2=eti
 O2=eti.o
+USELIBS2=../lib/libres+log.a ../lib/util.a 
+
+PROG3=monitor
+O3=monitor.o
+USELIBS3=../lib/libres+log.a ../lib/util.a 
 
-all: $(PROG1) $(PROG2)
+all: $(PROG1) $(PROG2) $(PROG3)
 
 $(PROG1): $(O1) $(USELIBS1)
-	$(CC) $(CFLAGS) -o $(PROG1) $(O1) $(USELIBS1) $(NETLIB)
+	$(CC) $(CFLAGS) -o $(PROG1) $(O1) $(USELIBS1) $(ZLIB) $(ELIB)
+
+$(PROG2): $(O2) $(USELIBS2)
+	$(CC) $(CFLAGS) -o $(PROG2) $(O2) $(USELIBS2) $(ZLIB) $(ELIB)
 
-$(PROG2): $(O2) $(USELIBS1)
-	$(CC) $(CFLAGS) -o $(PROG2) $(O2) $(USELIBS1) $(NETLIB)
+$(PROG3): $(O3) $(USELIBS3)
+	$(CC) $(CFLAGS) -o $(PROG3) $(O3) $(USELIBS3) $(ZLIB) $(ELIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-	rm -f *.log *.[oa] $(PROG1) $(PROG2) 
-	rm -f core mon.out gmon.out errlist *~ fifo.* 
+	rm -f *.log *.[oa] $(PROG1) $(PROG2) $(PROG3)
+	rm -f core mon.out gmon.out errlist *~ fifo.*
 
 depend: depend2