From 40f472b5f14f2d59d5f72d5814351ffdc1f54418 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 24 Oct 2007 22:10:24 +0000 Subject: [PATCH] Avoid per-target CPPFLAGS. If we use per-target flags, AM_PROG_CC_C_O is required or we just dont it. --- test/Makefile.am | 5 ++--- util/Makefile.am | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index b8d0b7d..1bd2325 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,6 @@ ## Copyright (C) 1995-2007, Index Data ApS ## All rights reserved. -## $Id: Makefile.am,v 1.40 2007-10-24 13:50:03 adam Exp $ +## $Id: Makefile.am,v 1.41 2007-10-24 22:10:24 adam Exp $ check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \ tstsoap1 tstsoap2 tstodrstack tstlogthread tstxmlquery tstpquery \ @@ -31,8 +31,7 @@ EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \ YAZCOMP = ../util/yaz-asncomp YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS) -AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) -tst_icu_I18N_CPPFLAGS=$(AM_CPPFLAGS) $(ICU_CPPFLAGS) +AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(ICU_CPPFLAGS) dist-hook: mkdir -p $(distdir)/cql diff --git a/util/Makefile.am b/util/Makefile.am index ce451b3..5c64868 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ ## Copyright (C) 1995-2007, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.33 2007-10-22 12:21:40 adam Exp $ +## $Id: Makefile.am,v 1.34 2007-10-24 22:10:25 adam Exp $ bin_SCRIPTS = yaz-asncomp yaz-config @@ -8,8 +8,7 @@ EXTRA_DIST = yaz-asncomp yaz-icu-example.xml DISTCLEANFILES = yaz-config -AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) -yaz_icu_CPPFLAGS=$(AM_CPPFLAGS) $(ICU_CPPFLAGS) +AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(ICU_CPPFLAGS) bin_PROGRAMS = yaz-marcdump yaz-iconv yaz-illclient yaz-icu noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark yaz-xmlquery -- 1.7.10.4