From 26d07328e36c41d39216d66d742d133cf7512995 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 21 Mar 2001 15:02:39 +0000 Subject: [PATCH] More fixes for make where sourcedir and builddir are different. --- asn/Makefile.am | 4 +-- ccl/Makefile.am | 4 +-- client/Makefile.am | 4 +-- comstack/Makefile.am | 4 +-- ill/Makefile.am | 16 +++++++----- odr/Makefile.am | 4 +-- retrieval/Makefile.am | 6 ++--- util/Makefile.am | 8 +++--- z39.50/Makefile.am | 67 ++++++++++++++++++++++++++++++++++++------------- ztest/Makefile.am | 4 +-- zutil/Makefile.am | 4 +-- 11 files changed, 81 insertions(+), 44 deletions(-) diff --git a/asn/Makefile.am b/asn/Makefile.am index 2b56b4b..363054a 100644 --- a/asn/Makefile.am +++ b/asn/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.4 2000-10-03 12:55:50 adam Exp $ +## $Id: Makefile.am,v 1.5 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES=libasn.la @@ -11,4 +11,4 @@ pkginclude_HEADERS = \ prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h \ prt-exp.h prt-ext.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include diff --git a/ccl/Makefile.am b/ccl/Makefile.am index ac4b679..ecd4f6f 100644 --- a/ccl/Makefile.am +++ b/ccl/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.5 2001-03-19 21:30:06 adam Exp $ +## $Id: Makefile.am,v 1.6 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES = libccl.la @@ -8,7 +8,7 @@ EXTRA_DIST = bib1 LIBS = $(READLINE_LIBS) -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include libccl_la_SOURCES = cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c \ cclqfile.c cclstr.c diff --git a/client/Makefile.am b/client/Makefile.am index 52a6e9a..dfa0fc7 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,6 +1,6 @@ ## Copyright (C) 1995-2000, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.9 2001-03-19 21:30:06 adam Exp $ +## $Id: Makefile.am,v 1.10 2001-03-21 15:02:39 adam Exp $ bin_PROGRAMS=yaz-client @@ -10,4 +10,4 @@ yaz_client_SOURCES=client.c admin.c admin.h yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS) -INCLUDES=-I$(srcdir)/../include -DCCL2RPN=1 +INCLUDES=-I$(top_srcdir)/include -DCCL2RPN=1 diff --git a/comstack/Makefile.am b/comstack/Makefile.am index a28dfab..1d5f540 100644 --- a/comstack/Makefile.am +++ b/comstack/Makefile.am @@ -1,8 +1,8 @@ -## $Id: Makefile.am,v 1.3 2000-04-05 07:39:54 adam Exp $ +## $Id: Makefile.am,v 1.4 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES=libcomstack.la -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include LIBS = diff --git a/ill/Makefile.am b/ill/Makefile.am index 666abd1..4629faa 100644 --- a/ill/Makefile.am +++ b/ill/Makefile.am @@ -1,6 +1,6 @@ -## $Id: Makefile.am,v 1.5 2000-04-05 07:39:54 adam Exp $ +## $Id: Makefile.am,v 1.6 2001-03-21 15:02:39 adam Exp $ -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include EXTRA_DIST=ill9702.asn item-req.asn ill.tcl @@ -10,8 +10,12 @@ LIBS = libill_la_SOURCES=ill-core.c item-req.c ill-get.c -ill-core.c ../include/yaz/ill-core.h: ill.tcl ill9702.asn ../util/yaz-comp - ../util/yaz-comp -d ill.tcl -i yaz -I ../include $(YCFLAGS) ill9702.asn +$(srcdir)/ill-core.c \ +$(top_srcdir)/include/yaz/ill-core.h: \ +$(srcdir)/ill.tcl $(srcdir)/ill9702.asn $(top_srcdir)/util/yaz-comp + cd $(srcdir); ../util/yaz-comp -d ill.tcl -i yaz -I ../include $(YCFLAGS) ill9702.asn -item-req.c ../include/yaz/item-req.h: ill.tcl item-req.asn ../util/yaz-comp - ../util/yaz-comp -d ill.tcl -i yaz -I ../include $(YCFLAGS) item-req.asn +$(srcdir)/item-req.c \ +$(top_srcdir)/include/yaz/item-req.h: \ +$(srcdir)/ill.tcl $(srcdir)/item-req.asn $(top_srcdir)/util/yaz-comp + cd $(srcdir); ../util/yaz-comp -d ill.tcl -i yaz -I ../include $(YCFLAGS) item-req.asn diff --git a/odr/Makefile.am b/odr/Makefile.am index c4788c1..b0ee1a7 100644 --- a/odr/Makefile.am +++ b/odr/Makefile.am @@ -1,8 +1,8 @@ -## $Id: Makefile.am,v 1.3 2000-04-05 07:39:55 adam Exp $ +## $Id: Makefile.am,v 1.4 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES = libodr.la -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include LIBS = diff --git a/retrieval/Makefile.am b/retrieval/Makefile.am index 0d9aab0..af04b3e 100644 --- a/retrieval/Makefile.am +++ b/retrieval/Makefile.am @@ -1,12 +1,12 @@ -## $Id: Makefile.am,v 1.3 2000-04-05 07:39:55 adam Exp $ +## $Id: Makefile.am,v 1.4 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES=libret.la LIBS = libret_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c d1_absyn.c \ - d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c d1_marc.c\ + d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c d1_marc.c \ d1_write.c d1_expout.c d1_sumout.c d1_soif.c d1_prtree.c d1_if.c -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include diff --git a/util/Makefile.am b/util/Makefile.am index 010e9cc..c023e99 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ -## Copyright (C) 1994-2000, Index Data +## Copyright (C) 1994-2001, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.8 2000-11-23 10:58:33 adam Exp $ +## $Id: Makefile.am,v 1.9 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES = libutil.la @@ -12,9 +12,9 @@ EXTRA_DIST = yaz-comp LIBS = -INCLUDES =-I$(srcdir)/../include +INCLUDES =-I$(top_srcdir)/include -libyazthread_la_INCLUDES=-I$(srcdir)/../include +libyazthread_la_INCLUDES=-I$(top_srcdir)/include noinst_PROGRAMS = marcdump diff --git a/z39.50/Makefile.am b/z39.50/Makefile.am index 3ae3768..42387df 100644 --- a/z39.50/Makefile.am +++ b/z39.50/Makefile.am @@ -1,6 +1,6 @@ -## $Id: Makefile.am,v 1.4 2000-04-05 07:39:55 adam Exp $ +## $Id: Makefile.am,v 1.5 2001-03-21 15:02:39 adam Exp $ -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include noinst_LTLIBRARIES = libasn.la @@ -8,28 +8,61 @@ EXTRA_DIST=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl esadmin.asn LIBS = +YAZCOMP = $(top_srcdir)/util/yaz-comp + libasn_la_SOURCES = z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \ z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-opac.c z-uifr1.c \ z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c \ zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \ zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.c -z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \ - z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-opac.c z-uifr1.c \ - z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c \ - zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \ - zes-pset.c zes-update0.c \ - ../include/yaz/z-accdes1.h: z.tcl z3950v3.asn ../util/yaz-comp - ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) z3950v3.asn +# Rules for Z39.50 V3 +$(srcdir)/z-accdes1.c \ +$(srcdir)/z-accform1.c \ +$(srcdir)/z-acckrb1.c \ +$(srcdir)/z-core.c \ +$(srcdir)/z-diag1.c \ +$(srcdir)/z-espec1.c \ +$(srcdir)/z-estask.c \ +$(srcdir)/z-exp.c \ +$(srcdir)/z-grs.c \ +$(srcdir)/z-opac.c \ +$(srcdir)/z-uifr1.c \ +$(srcdir)/z-rrf1.c \ +$(srcdir)/z-rrf2.c \ +$(srcdir)/z-sum.c \ +$(srcdir)/z-sutrs.c \ +$(srcdir)/zes-expi.c \ +$(srcdir)/zes-exps.c \ +$(srcdir)/zes-order.c \ +$(srcdir)/zes-pquery.c \ +$(srcdir)/zes-psched.c \ +$(srcdir)/zes-pset.c \ +$(srcdir)/zes-update0.c \ +$(top_srcdir)/include/z-accdes1.h \ +$(top_srcdir)/include/z-core.h: \ +$(srcdir)/z.tcl $(srcdir)/z3950v3.asn $(YAZCOMP) + cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) z3950v3.asn -z-date.c ../include/yaz/z-date.h: z.tcl datetime.asn ../util/yaz-comp - ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) datetime.asn +# Date extension +$(srcdir)/z-date.c \ +$(top_srcdir)/include/yaz/z-date.h: $(srcdir)/z.tcl $(srcdir)/datetime.asn $(YAZCOMP) + cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I../include $(YCFLAGS) datetime.asn -z-univ.c ../include/yaz/z-univ.h: z.tcl univres.asn ../util/yaz-comp - ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) univres.asn +# UNIverse extension +$(srcdir)/z-univ.c \ +$(top_srcdir)/include/yaz/z-univ.h: \ +$(srcdir)/z.tcl $(srcdir)/univres.asn $(YAZCOMP) + cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) univres.asn -zes-update.c ../include/yaz/zes-update.h: z.tcl esupdate.asn ../util/yaz-comp - ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) esupdate.asn +# New Update extended service +$(srcdir)/zes-update.c \ +$(top_srcdir)/include/yaz/zes-update.h: \ +$(srcdir)/z.tcl $(srcdir)/esupdate.asn $(YAZCOMP) + cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) esupdate.asn -zes-admin.c ../include/yaz/zes-admin.h: z.tcl esadmin.asn ../util/yaz-comp - ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) esadmin.asn +# Admin extended service +$(srcdir)/zes-admin.c \ +$(top_srcdir)/include/yaz/zes-admin.h: \ +$(srcdir)/z.tcl $(srcdir)/esadmin.asn $(YAZCOMP) + cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) esadmin.asn diff --git a/ztest/Makefile.am b/ztest/Makefile.am index f319c89..0fd4142 100644 --- a/ztest/Makefile.am +++ b/ztest/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.4 2000-11-23 10:58:33 adam Exp $ +## $Id: Makefile.am,v 1.5 2001-03-21 15:02:39 adam Exp $ bin_PROGRAMS=yaz-ztest @@ -11,4 +11,4 @@ extra=../lib/libyazthread.la endif yaz_ztest_LDADD=$(extra) ../lib/libyaz.la $(LIBTHREAD) -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include diff --git a/zutil/Makefile.am b/zutil/Makefile.am index 5823a51..221a0c0 100644 --- a/zutil/Makefile.am +++ b/zutil/Makefile.am @@ -1,7 +1,7 @@ -## $Id: Makefile.am,v 1.4 2000-04-05 07:39:55 adam Exp $ +## $Id: Makefile.am,v 1.5 2001-03-21 15:02:39 adam Exp $ noinst_LTLIBRARIES = libzutil.la -INCLUDES=-I$(srcdir)/../include +INCLUDES=-I$(top_srcdir)/include LIBS = -- 1.7.10.4