Lots of changes. They aren't visible though.

[egate.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 1bb7c82..01f5fcc 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,16 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.25  1995/05/19 13:25:58  adam
+# 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
@@ -86,11 +95,9 @@
 #
 SHELL=/bin/sh
 
-#ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
-#ZINC=-I$(ZPRE)
-#ZLIB=$(ZPRE)/libz3950.a
-
+ZINC=-I../../yaz/include
 ZLIB=../../yaz/lib/libyaz.a
+ZDEFS=
 
 INCLUDE=-I../include
 #CFLAGS=-g -Wall 
@@ -100,7 +107,7 @@ DEFS=$(INCLUDE) -DUSE_FML=1
 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 $(ZLIB) $(REGEXOBJ)
+../lib/util.a $(REGEXOBJ)
 
 PROG2=eti
 O2=eti.o
@@ -113,13 +120,13 @@ USELIBS3=../lib/libres+log.a ../lib/util.a
 all: $(PROG1) $(PROG2) $(PROG3)
 
 $(PROG1): $(O1) $(USELIBS1)
-       $(CC) $(CFLAGS) -o $(PROG1) $(O1) $(USELIBS1) $(NETLIB)
+       $(CC) $(CFLAGS) -o $(PROG1) $(O1) $(USELIBS1) $(ZLIB) $(NETLIB)
 
 $(PROG2): $(O2) $(USELIBS2)
-       $(CC) $(CFLAGS) -o $(PROG2) $(O2) $(USELIBS2) $(NETLIB)
+       $(CC) $(CFLAGS) -o $(PROG2) $(O2) $(USELIBS2) $(ZLIB) $(NETLIB)
 
 $(PROG3): $(O3) $(USELIBS3)
-       $(CC) $(CFLAGS) -o $(PROG3) $(O3) $(USELIBS3) $(NETLIB)
+       $(CC) $(CFLAGS) -o $(PROG3) $(O3) $(USELIBS3) $(ZLIB) $(NETLIB)
 
 .c.o:
        $(CC) -c $(DEFS) $(CFLAGS) $<