X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2FMakefile;h=e90ac8168b19ed65f5d4d404d6bf5b36724107c3;hb=ee91cff35d9150fe522c72b903680ccc49bd75ba;hp=54f578dd70f1d6028b904c16ea13d7be6e6a5741;hpb=25b7a1f19e0a16578e5918dd7ce70320d915dd23;p=yaz-moved-to-github.git

diff --git a/server/Makefile b/server/Makefile
index 54f578d..e90ac81 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,21 +1,24 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.11 1995-03-16 13:28:59 quinn Exp $
+# $Id: Makefile,v 1.25 1995-05-30 10:25:46 quinn Exp $
+
+LIBDIR=../lib
+
+#LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
 
 SHELL=/bin/sh
-INCLUDE=-I../include -I. -I../asn -I../odr -I../yazlib -I../../egate/include\
- -I../../xtimosi/src -I../../alex/include
-LIBDIR=../../lib
+INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBINCLUDE=-L$(LIBDIR)
 #CFLAGS=-Wall -pedantic -g
 DEFS=$(INCLUDE)
 LIB=$(LIBDIR)/libserver.a 
-LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a $(LIBDIR)/libcomstack.a ../../alex/lib/util.a  ../../egate/lib/util.a
-PO = eventl.o seshigh.o statserv.o
-CPP=cc -E
+LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
+$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a
+PO = eventl.o seshigh.o statserv.o requestq.o
+CPP=$(CC) -E
 PROG=ztest
-PROGO=ztest.o session.o
+PROGO=ztest.o
 
 all: $(LIBDIR) $(LIB) $(PROG)
 
@@ -36,15 +39,14 @@ $(LIBDIR):
 	$(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-	rm -f *.[oa] test core mon.out gmon.out errlist tst cli
+	rm -f *.[oa] test core mon.out gmon.out errlist tst cli $(PROG)
 
 depend: depend2
-:
+
 depend1:
-	mv Makefile Makefile.tmp
-	sed '/^#Depend/q' <Makefile.tmp >Makefile
-	$(CPP) $(INCLUDE) -M *.c >>Makefile
-	-rm Makefile.tmp
+	sed '/^#Depend/q' <Makefile >Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
+	mv -f Makefile.tmp Makefile
 
 depend2:
 	$(CPP) $(INCLUDE) -M *.c >.depend