From 9a14cd596da0fd59d38a62aa4e4535dfd89aa295 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 16 Jun 2004 20:49:17 +0000 Subject: [PATCH] For includes specs in Makefiles use AM_CPPFLAGS instead of INCLUDE. Use $(YAZINC) instead of @YAZINC@. --- bfile/Makefile.am | 4 ++-- dfa/Makefile.am | 4 ++-- dict/Makefile.am | 4 ++-- isam/Makefile.am | 4 ++-- isamb/Makefile.am | 4 ++-- isamc/Makefile.am | 4 ++-- isams/Makefile.am | 4 ++-- recctrl/Makefile.am | 4 ++-- rset/Makefile.am | 5 ++--- util/Makefile.am | 4 ++-- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/bfile/Makefile.am b/bfile/Makefile.am index 9ecb102..28ae99f 100644 --- a/bfile/Makefile.am +++ b/bfile/Makefile.am @@ -1,7 +1,7 @@ -## $Id: Makefile.am,v 1.1 2000-04-05 09:49:35 adam Exp $ Copyright (C) 1994-1998, Index Data ApS +## $Id: Makefile.am,v 1.2 2004-06-16 20:49:17 adam Exp $ Copyright (C) 1994-1998, Index Data ApS noinst_LIBRARIES = libbfile.a -INCLUDES = -I$(srcdir)/../include @YAZINC@ +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) libbfile_a_SOURCES = bfile.c mfile.c cfile.c commit.c cfile.h diff --git a/dfa/Makefile.am b/dfa/Makefile.am index c8c59ba..a6d885d 100644 --- a/dfa/Makefile.am +++ b/dfa/Makefile.am @@ -1,10 +1,10 @@ -## $Id: Makefile.am,v 1.2 2002-08-17 08:00:27 adam Exp $ +## $Id: Makefile.am,v 1.3 2004-06-16 20:49:17 adam Exp $ noinst_LIBRARIES = libdfa.a noinst_PROGRAMS = agrep lexer grepper -INCLUDES = -I$(srcdir)/../include @YAZINC@ +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) LDADD = libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB) agrep_SOURCES = agrep.c diff --git a/dict/Makefile.am b/dict/Makefile.am index d6e99c3..5045062 100644 --- a/dict/Makefile.am +++ b/dict/Makefile.am @@ -1,9 +1,9 @@ -## $Id: Makefile.am,v 1.5 2002-08-17 08:00:27 adam Exp $ +## $Id: Makefile.am,v 1.6 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = libdict.a noinst_PROGRAMS = dicttest dictext -INCLUDES = -I$(srcdir)/../include @YAZINC@ +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) LDADD = libdict.a ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB) diff --git a/isam/Makefile.am b/isam/Makefile.am index a0bbfb6..df9da5b 100644 --- a/isam/Makefile.am +++ b/isam/Makefile.am @@ -1,8 +1,8 @@ -## $Id: Makefile.am,v 1.2 2002-08-17 08:00:27 adam Exp $ +## $Id: Makefile.am,v 1.3 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = libisam.a -INCLUDES = -I$(srcdir)/../include @YAZINC@ +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) LDADD = ../util/libutil.a ../bfile/libbfile.a $(YAZLIB) $(TCL_LIB) diff --git a/isamb/Makefile.am b/isamb/Makefile.am index 2cd07b4..37aadc9 100644 --- a/isamb/Makefile.am +++ b/isamb/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.3 2003-06-23 15:36:11 adam Exp $ +## $Id: Makefile.am,v 1.4 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = libisamb.a @@ -11,6 +11,6 @@ tstisamb_LDADD = libisamb.a ../bfile/libbfile.a ../util/libutil.a $(YAZLIB) libisamb_a_SOURCES = isamb.c -INCLUDES = -I$(srcdir)/../include @YAZINC@ +AM_CPPFLAGS=-I$(srcdir)/../include $(YAZINC) LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB) diff --git a/isamc/Makefile.am b/isamc/Makefile.am index 7c0cb4f..7e13e43 100644 --- a/isamc/Makefile.am +++ b/isamc/Makefile.am @@ -1,9 +1,9 @@ -## $Id: Makefile.am,v 1.3 2002-08-17 08:00:28 adam Exp $ +## $Id: Makefile.am,v 1.4 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = libisamc.a libisamc_a_SOURCES = isamc.c isamd.c merge.c merge-d.c isamc-p.h isamd-p.h -INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../index @YAZINC@ +AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../index $(YAZINC) LDADD = ../util/libutil.a ../bfile/libbfile.a libisamc.a $(YAZLIB) $(TCL_LIB) diff --git a/isams/Makefile.am b/isams/Makefile.am index 8e19c42..67d44ae 100644 --- a/isams/Makefile.am +++ b/isams/Makefile.am @@ -1,7 +1,7 @@ -## $Id: Makefile.am,v 1.1 2000-04-05 09:49:36 adam Exp $ +## $Id: Makefile.am,v 1.2 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = libisams.a -INCLUDES = -I$(srcdir)/../include @YAZINC@ +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) libisams_a_SOURCES = isams.c diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am index c96180a..69ecc00 100644 --- a/recctrl/Makefile.am +++ b/recctrl/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.9 2004-05-21 11:58:56 adam Exp $ +## $Id: Makefile.am,v 1.10 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = librecctrl.a @@ -15,4 +15,4 @@ librecctrl_a_SOURCES = recctrl.c recgrs.c sgmlread.c regxread.c \ grsread.h recgrs.h rectext.h xmlread.c danbibr.c \ $(PERLREAD) -INCLUDES = -I$(srcdir)/../include @YAZINC@ $(TCL_INCLUDE) +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) diff --git a/rset/Makefile.am b/rset/Makefile.am index b7fc716..be7c936 100644 --- a/rset/Makefile.am +++ b/rset/Makefile.am @@ -1,8 +1,7 @@ -## $Id: Makefile.am,v 1.5 2004-06-09 12:15:25 adam Exp $ +## $Id: Makefile.am,v 1.6 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = librset.a librset_a_SOURCES = rset.c rstemp.c rsisam.c rsnull.c rsbool.c rsbetween.c \ rsisamc.c rsm_or.c rsisams.c rsisamd.c rsisamb.c rsprox.c -INCLUDES = -I$(srcdir)/../include $(YAZINC) - +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) diff --git a/util/Makefile.am b/util/Makefile.am index fac1cb9..b10d269 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.7 2003-02-04 12:06:48 pop Exp $ +## $Id: Makefile.am,v 1.8 2004-06-16 20:49:18 adam Exp $ noinst_LIBRARIES = libutil.a @@ -6,7 +6,7 @@ noinst_PROGRAMS = passtest EXTRA_DIST = zebrasrv.rh -AM_CPPFLAGS = -I$(srcdir)/../include @YAZINC@ -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\" +AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\" LDADD = libutil.a $(YAZLIB) $(TCL_LIB) libutil_a_SOURCES = res.c charmap.c zebramap.c passwddb.c zebra-lock.c dirent.c xpath.c -- 1.7.10.4