Minor change to make C++ happy.

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

diff --git a/Makefile b/Makefile
index 9e68963..93d9fdb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
-# 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.28 1995-12-06 16:06:20 quinn Exp $
+# $Id: Makefile,v 1.36 1998-01-29 13:43:03 adam Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
-ODEFS=-DUSE_XTIMOSI
-RFC1006=rfc1006
-LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
-XMOSI=xmosi.o
+#ODEFS=-DUSE_XTIMOSI
+#RFC1006=rfc1006
+#LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
+#XMOSI=xmosi.o
 
 CDEFS=$(ODEFS)
 #CC=
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=util odr asn $(RFC1006) ccl comstack retrieval client server makelib
+SUBDIR=util odr asn $(RFC1006) ccl comstack retrieval client server ztest makelib
 # Add external libraries to the ELIBS macro
 ELIBS=
 CONTROL=RANLIB="ranlib" ELIBS="$(ELIBS)"
@@ -28,17 +28,24 @@ INCDIR=/usr/local/include
 YAZDIR=/usr/local/lib/yaz
 
 all:
-       for i in $(SUBDIR); do cd $$i; if $(MAKE) $(CONTROL)\
-       CFLAGS="$(CFLAGS) $(CDEFS)" LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
+       for i in $(SUBDIR); do cd $$i; if $(MAKE) $(CONTROL) \
+       CFLAGS="$(CFLAGS)" CDEFS="$(CDEFS)" LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
        then cd ..; else exit 1; fi; done
 
 dep depend:
-       for i in $(SUBDIR); do cd $$i; if $(MAKE) depend; then cd ..; else exit 1; fi; done
+       for i in $(SUBDIR); do cd $$i; if $(MAKE) CDEFS="$(CDEFS)" depend;\
+                then cd ..; else exit 1; fi; done
 
 clean:
        for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done
        -rm lib/*.a
 
+oclean:
+       for i in $(SUBDIR); do (cd $$i; rm -f *.o); done
+       mv lib/libyaz.a .; rm -f lib/*.a; mv libyaz.a lib
+       cd client; strip client
+       cd server; strip ztest
+
 cleanup:
        rm -f `find $(SUBDIR) -name "*.[oa]" -print`
        rm -f `find $(SUBDIR) -name "core" -print`
@@ -116,4 +123,4 @@ install.misc:
 
 wc:
        wc `find . -name '*.[ch]'`
-       
+