Added --with-yc option to configure. For the data1_node in data1.h:

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

diff --git a/Makefile.in b/Makefile.in
index fcda7e6..70334f3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,35 +1,28 @@
 # Copyright (C) 1995-1998, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.2 1998-08-25 16:19:37 adam Exp $
+# $Id: Makefile.in,v 1.5 1998-10-28 15:09:59 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
+SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest lib
 # Add external libraries to the LIBS macro
 LIBS=@LIBS@
 
@@ -62,7 +55,6 @@ dep depend:
 
 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