New sub directory zutil. Moved YAZ Compiler to be part of YAZ tree.

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

diff --git a/Makefile.in b/Makefile.in
index 70334f3..bd2c11b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Copyright (C) 1995-1998, Index Data 
+# Copyright (C) 1995-1999, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.5 1998-10-28 15:09:59 adam Exp $
+# $Id: Makefile.in,v 1.8 1999-06-08 10:10:15 adam Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
 #CDEFS=-DUSE_XTIMOSI
@@ -22,7 +22,7 @@ CC=@CC@
 CPP=@CPP@
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest lib
+SUBDIR=$(MOD) util odr zutil $(RFC1006) ccl comstack retrieval client server ztest lib
 # Add external libraries to the LIBS macro
 LIBS=@LIBS@
 
@@ -41,17 +41,17 @@ INCDIR=$(prefix)/include
 YAZDIR=$(prefix)/lib/yaz
 
 all:
-       for i in $(SUBDIR); do cd $$i; if $(MAKE) CC="$(CC)" \
+       for i in $(SUBDIR); do (cd $$i; $(MAKE) CC="$(CC)" \
                RANLIB="$(RANLIB)" LIBS="$(LIBS)" \
                INCLUDE="$(INCLUDE)" CFLAGS="$(CFLAGS)" \
                CDEFS="$(CDEFS)" \
-               LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
-               then cd ..; else exit 1; fi; done
+               LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)");\
+               done
 
 dep depend:
-       for i in $(SUBDIR); do cd $$i; if $(MAKE) CPP="$(CPP)" \
-               INCLUDE="$(INCLUDE)" CDEFS="$(CDEFS)" depend;\
-                then cd ..; else exit 1; fi; done
+       for i in $(SUBDIR); do (cd $$i; $(MAKE) CPP="$(CPP)" \
+               INCLUDE="$(INCLUDE)" CDEFS="$(CDEFS)" depend);\
+                done
 
 clean:
        for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done
@@ -60,7 +60,7 @@ 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
+       cd ztest; strip ztest
 
 cleanup:
        rm -f `find $(SUBDIR) -name "*.[oa]" -print`
@@ -85,7 +85,7 @@ install.bin:
        @echo "Installing client -> $(BINDIR)"; \
        cp client/client $(BINDIR)/client; chmod 755 $(BINDIR)/client
        @echo "Installing ztest -> $(BINDIR)"; \
-       cp server/ztest $(BINDIR)/ztest; chmod 755 $(BINDIR)/ztest
+       cp ztest/ztest $(BINDIR)/ztest; chmod 755 $(BINDIR)/ztest
 
 install.lib:
        @if [ ! -d $(LIBDIR) ]; then \