X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.in;h=0e03edd0f6406b1a9a1db282eb584dbcd36e0c8a;hp=77fe2273a378e0b3cf5867db685401c54976a3a5;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hpb=db63853847b11ee3432b140fa28b23360db90007

diff --git a/Makefile.in b/Makefile.in
index 77fe227..0e03edd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,35 +1,28 @@
-# Copyright (C) 1995-1998, Index Data 
+# Copyright (C) 1995-1999, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.4 1998-09-28 12:44:47 adam Exp $
+# $Id: Makefile.in,v 1.12 1999-06-09 09:43:31 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
+
+# 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 lib
+SUBDIR=util odr $(MOD) zutil $(RFC1006) ccl comstack client server ztest retrieval lib
 # Add external libraries to the LIBS macro
 LIBS=@LIBS@
 
@@ -57,8 +50,8 @@ 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
@@ -67,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`
@@ -77,6 +70,9 @@ cleanup:
 
 distclean: clean cleandepend
 
+comp:
+	cd z39.50; make comp
+
 cleandepend: 
 	for i in $(SUBDIR); do (cd $$i; \
 		if sed '/^#Depend/q' <Makefile >Makefile.tmp; then \
@@ -92,7 +88,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 \