Header files moved to include (used to be z39.50).

diff --git a/Makefile.in b/Makefile.in
index f191b33..0e03edd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1999, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.11 1999-06-08 13:11:55 adam Exp $
+# $Id: Makefile.in,v 1.12 1999-06-09 09:43:31 adam Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
 #CDEFS=-DUSE_XTIMOSI
@@ -12,7 +12,7 @@
 CDEFS=@DEFS@
 
 # Standard include path and original protocol encoders.
-INCLUDE=-I. -I../z39.50 -I../include
+INCLUDE=-I. -I../include
 
 # The Module below is either asn (the original de/en-coders)
 # or z39.50 (the compiled de/en-coders).
@@ -70,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 \

diff --git a/ccl/Makefile.in b/ccl/Makefile.in
index 428f2a9..0f39bfa 100644 (file)
--- a/ccl/Makefile.in
+++ b/ccl/Makefile.in
@@ -2,7 +2,10 @@
 # Europagate, 1995
 #
 # $Log: Makefile.in,v $
-# Revision 1.4  1999-03-31 11:15:37  adam
+# Revision 1.5  1999-06-09 09:43:31  adam
+# Header files moved to include (used to be z39.50).
+#
+# Revision 1.4  1999/03/31 11:15:37  adam
 # Fixed memory leaks in ccl_find_str and ccl_qual_rm.
 #
 # Revision 1.3  1998/10/28 15:10:03  adam
@@ -67,7 +70,7 @@ RANLIB=@RANLIB@
 CDEFS=@DEFS@
 LIBS=@LIBS@
 
-INCLUDE=-I../z39.50 -I../include
+INCLUDE=-I../include
 PROG=cclsh
 LIB=../lib/libccl.a
 PO=cclfind.o ccltoken.o cclerrms.o cclqual.o cclptree.o cclqfile.o cclstr.o

diff --git a/client/Makefile.in b/client/Makefile.in
index be24467..8340b99 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1999, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.7 1999-06-08 10:10:16 adam Exp $
+# $Id: Makefile.in,v 1.8 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -15,7 +15,7 @@ LIBDIR=../lib
 
 #LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
 
-INCLUDE=-I../z39.50 -I../include -I. -I../../xtimosi/src
+INCLUDE=-I../include -I. -I../../xtimosi/src
 DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
 YAZLIBS=$(LIBDIR)/libzutil.a $(LIBDIR)/libasn.a $(LIBDIR)/libcomstack.a \
   ../lib/libccl.a $(LIBMOSI) $(LIBDIR)/libodr.a $(LIBDIR)/libutil.a 

diff --git a/odr/Makefile.in b/odr/Makefile.in
index f186cbb..9877b3f 100644 (file)
--- a/odr/Makefile.in
+++ b/odr/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1998, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.3 1998-10-28 15:10:07 adam Exp $
+# $Id: Makefile.in,v 1.4 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -11,7 +11,7 @@ RANLIB=@RANLIB@
 CDEFS=@DEFS@
 LIBS=@LIBS@
 
-INCLUDE=-I../z39.50 -I../include -I.
+INCLUDE=-I../include -I.
 LIBDIR=../lib
 
 DEFS=$(INCLUDE) $(CDEFS) # -DODR_DEBUG

diff --git a/retrieval/Makefile.in b/retrieval/Makefile.in
index 00a53cc..bfa488d 100644 (file)
--- a/retrieval/Makefile.in
+++ b/retrieval/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.2 1998-10-28 15:10:08 adam Exp $
+# $Id: Makefile.in,v 1.3 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -8,7 +8,7 @@ RANLIB=@RANLIB@
 CDEFS=@DEFS@
 ELIBS=@LIBS@
 
-INCLUDE=-I../z39.50 -I../include -I.
+INCLUDE=-I../include -I.
 DEFS=$(INCLUDE) $(CDEFS)
 LIB=../lib/libret.a
 PO = d1_handle.o d1_read.o d1_attset.o d1_tagset.o d1_absyn.o d1_grs.o \

diff --git a/server/Makefile.in b/server/Makefile.in
index c2b5859..4381f9b 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1999, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.4 1999-04-16 14:45:55 adam Exp $
+# $Id: Makefile.in,v 1.5 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -15,7 +15,7 @@ LIBDIR=../lib
 
 #LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
 
-INCLUDE=-I../z39.50 -I../include -I. -I../../xtimosi/src
+INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBINCLUDE=-L$(LIBDIR)
 DEFS=$(INCLUDE) $(CDEFS)
 LIB=$(LIBDIR)/libserver.a 

diff --git a/util/Makefile.in b/util/Makefile.in
index 9206397..9fbf236 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.6 1999-06-08 10:10:16 adam Exp $
+# $Id: Makefile.in,v 1.7 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -11,7 +11,7 @@ RANLIB=@RANLIB@
 CDEFS=@DEFS@
 LIBS=@LIBS@
 
-INCLUDE=-I../z39.50 -I../include -I.
+INCLUDE=-I../include -I.
 LIBDIR=../lib
 
 DEFS=$(INCLUDE) $(CDEFS)

diff --git a/z39.50/Makefile.in b/z39.50/Makefile.in
index 0f071c9..870ab65 100644 (file)
--- a/z39.50/Makefile.in
+++ b/z39.50/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.2 1999-06-08 13:11:55 adam Exp $
+# $Id: Makefile.in,v 1.3 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -42,17 +42,17 @@ $(LIB): $(PO)
        ar qc $(LIB) $(PO)
        $(RANLIB) $(LIB)
 
-$(CF) z-accdes1.h z-core.h: z.tcl z3950v3.asn ../util/yc.tcl
-       ../util/yc.tcl -d z.tcl $(YCFLAGS) z3950v3.asn
+$(CF) ../include/z-accdes1.h: z.tcl z3950v3.asn ../util/yc.tcl
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) z3950v3.asn
 
-z-date.h z-date.c: z.tcl datetime.asn ../util/yc.tcl
-       ../util/yc.tcl -d z.tcl $(YCFLAGS) datetime.asn
+z-date.c ../include/z-date.h: z.tcl datetime.asn ../util/yc.tcl
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) datetime.asn
 
-z-univ.h z-univ.c: z.tcl univres.asn
-       ../util/yc.tcl -d z.tcl $(YCFLAGS) univres.asn
+z-univ.c ../include/z-univ.h: z.tcl univres.asn
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) univres.asn
 
-zes-update.h zes-update.c: z.tcl esupdate.asn
-       ../util/yc.tcl -d z.tcl $(YCFLAGS) esupdate.asn
+zes-update.c ../include/zes-update.h: z.tcl esupdate.asn
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) esupdate.asn
 
 .c.o:
        $(CC) -c $(CFLAGS) $(DEFS) $<
@@ -61,11 +61,15 @@ clean:
        -rm -f *.o yc-tst core *.out
 
 realclean: clean
-       -rm -f z-*.[cho] zes-*.[cho]
+       -rm -f z-*.[co] zes-*.[co]
 
-comp: z-core.h z-date.h z-univ.h zes-update.h
+comp:
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) z3950v3.asn
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) datetime.asn
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) univres.asn
+       ../util/yc.tcl -d z.tcl -I ../include $(YCFLAGS) esupdate.asn
 
-depend: z-core.h z-date.h z-univ.h zes-update.h
+depend: z-core.c z-date.c z-univ.c zes-update.c ../include/z-accdes1.h ../include/z-date.h ../include/z-univ.h ../include/zes-update.h
        sed '/^#Depend/q' <Makefile >Makefile.tmp
        $(CPP) $(DEFS) -M *.c >>Makefile.tmp
        mv -f Makefile.tmp Makefile

diff --git a/ztest/Makefile.in b/ztest/Makefile.in
index 96ac4d9..4d60c0a 100644 (file)
--- a/ztest/Makefile.in
+++ b/ztest/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1999, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.6 1999-06-08 10:10:16 adam Exp $
+# $Id: Makefile.in,v 1.7 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -16,7 +16,7 @@ LIBDIR=../lib
 #LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
 
 SHELL=/bin/sh
-INCLUDE=-I../z39.50 -I../include -I. -I../../xtimosi/src
+INCLUDE=-I../include -I. -I../../xtimosi/src
 DEFS=$(INCLUDE) $(CDEFS)
 LIB=$(LIBDIR)/libserver.a 
 YAZLIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libzutil.a $(LIBDIR)/libasn.a \

diff --git a/zutil/Makefile.in b/zutil/Makefile.in
index 479f6b3..a2d2a51 100644 (file)
--- a/zutil/Makefile.in
+++ b/zutil/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1999, Index Data
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.2 1999-06-08 13:11:55 adam Exp $
+# $Id: Makefile.in,v 1.3 1999-06-09 09:43:31 adam Exp $
 
 SHELL=/bin/sh
 
@@ -11,7 +11,7 @@ RANLIB=@RANLIB@
 CDEFS=@DEFS@
 LIBS=@LIBS@
 
-INCLUDE=-I../z39.50 -I../include -I.
+INCLUDE=-I../include -I.
 LIBDIR=../lib
 
 DEFS=$(INCLUDE) $(CDEFS)