X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.in;h=f191b33aa69f85199f3b5703607ea175a3b0537e;hp=57d6b3997c4995200d23b07c92ac41ea4573ee4d;hb=8d363b42a1805306b5df26aac694a4491d5c9119;hpb=1fbf9907e66c5697b9537a1a4849295c05b12b6b

diff --git a/Makefile.in b/Makefile.in
index 57d6b39..f191b33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,37 +1,30 @@
-# Copyright (C) 1995-1998, Index Data 
+# Copyright (C) 1995-1999, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:23 adam Exp $
+# $Id: Makefile.in,v 1.11 1999-06-08 13:11:55 adam Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
-#ODEFS=-DUSE_XTIMOSI
+#CDEFS=-DUSE_XTIMOSI
 #RFC1006=rfc1006
 #LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
 #XMOSI=xmosi.o
 
-CDEFS=@DEFS@ @ODEFS@
+CDEFS=@DEFS@
 
 # Standard include path and original protocol encoders.
-INCLUDE=-I. -I../include
-MOD=asn
-
-# Uncomment the two lines below if you want to try the ASN.1 compiler
-# (yc) for YAZ. Download yc separately and untar it along with YAZ:
-#  gunzip -c yaz.tar.gz | tar xvf -
-#  gunzip -c yc.tar.gz | tar xvf -
-#  cd yaz
-#  ln -s ../yc/z39.50 
-# You must run 'make depend' before 'make'.
-#INCLUDE=-I../z39.50 -I. -I../include
-#MOD=z39.50
+INCLUDE=-I. -I../z39.50 -I../include
+
+# The Module below is either asn (the original de/en-coders)
+# or z39.50 (the compiled de/en-coders).
+MOD=@ASNMODULE@
 
 CC=@CC@
 CPP=@CPP@
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest makelib
-# Add external libraries to the ELIBS macro
-ELIBS=@LIBS@
+SUBDIR=util odr $(MOD) zutil $(RFC1006) ccl comstack client server ztest retrieval lib
+# Add external libraries to the LIBS macro
+LIBS=@LIBS@
 
 RANLIB=@RANLIB@
 
@@ -49,7 +42,7 @@ YAZDIR=$(prefix)/lib/yaz
 
 all:
 	for i in $(SUBDIR); do cd $$i; if $(MAKE) CC="$(CC)" \
-		RANLIB="$(RANLIB)" ELIBS="$(ELIBS)" \
+		RANLIB="$(RANLIB)" LIBS="$(LIBS)" \
 		INCLUDE="$(INCLUDE)" CFLAGS="$(CFLAGS)" \
 		CDEFS="$(CDEFS)" \
 		LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
@@ -57,18 +50,17 @@ all:
 
 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
+		INCLUDE="$(INCLUDE)" 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
+	cd ztest; strip ztest
 
 cleanup:
 	rm -f `find $(SUBDIR) -name "*.[oa]" -print`
@@ -93,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 \