Minor change to make C++ happy.

[yaz-moved-to-github.git] / server / Makefile

diff --git a/server/Makefile b/server/Makefile
index 6830cc8..22e2a24 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,43 +1,46 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1995-1998, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.1 1995-03-10 18:22:44 quinn Exp $
+# $Id: Makefile,v 1.35 1998-01-07 13:34:06 adam Exp $
 
-SHELL=/bin/sh
-INCLUDE=-I../include -I. -I../asn -I../odr -I../../egate/include -I../../xtimosi/src
-#CFLAGS=-Wall -pedantic -g
-#CFLAGS=-g
-DEFS=$(INCLUDE)
-LIB= server.a 
-PO = eventl.o 
-CPP=cc -E
-#CC=checkergcc
+LIBDIR=../lib
+
+#LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
 
-all: $(LIB)
+SHELL=/bin/sh
+INCLUDE=-I../include -I. -I../../xtimosi/src
+LIBINCLUDE=-L$(LIBDIR)
+DEFS=$(INCLUDE) $(CDEFS)
+LIB=$(LIBDIR)/libserver.a 
+PO = eventl.o seshigh.o statserv.o requestq.o
+CPP=$(CC) -E
+RANLIB=ranlib
 
-alll:
+all: $(LIBDIR) $(LIB) 
 
 $(LIB): $(PO)
        rm -f $(LIB)
        ar qc $(LIB) $(PO)
-       ranlib $(LIB)
+       $(RANLIB) $(LIB)
+
+$(LIBDIR):
+       mkdir $(LIBDIR)
 
 .c.o:
        $(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       
+       $(CPP) $(DEFS) -M *.c >.depend  
 
 ifeq (.depend,$(wildcard .depend))
 include .depend