X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2FMakefile;h=34c4356346360ee2047d1673731f058f263d0511;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hp=824b76e29a9eeff492de4f2597749adb71f2069a;hpb=1b2f4362552dcb365b6e4722d5eac7bb704c6c01;p=yaz-moved-to-github.git

diff --git a/server/Makefile b/server/Makefile
index 824b76e..34c4356 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,7 +1,7 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1997, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.24 1995-05-30 10:16:09 quinn Exp $
+# $Id: Makefile,v 1.33 1997-09-17 12:10:39 adam Exp $
 
 LIBDIR=../lib
 
@@ -10,27 +10,20 @@ LIBDIR=../lib
 SHELL=/bin/sh
 INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS=-Wall -pedantic -g
-DEFS=$(INCLUDE)
+DEFS=$(INCLUDE) $(CDEFS)
 LIB=$(LIBDIR)/libserver.a 
 LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
-$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a
+$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a $(ELIBS)
 PO = eventl.o seshigh.o statserv.o requestq.o
 CPP=$(CC) -E
-PROG=ztest
-PROGO=ztest.o
+RANLIB=ranlib
 
-all: $(LIBDIR) $(LIB) $(PROG)
-
-$(PROG): $(LIB) $(PROGO) 
-	$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
-
-alll:
+all: $(LIBDIR) $(LIB) 
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 $(LIBDIR):
 	mkdir $(LIBDIR)
@@ -44,13 +37,12 @@ clean:
 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	
+	$(CPP) $(DEFS) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend