From 7f0e24a73392b1288b117ee46482f58f471ea094 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 19 Nov 2001 09:16:37 +0000
Subject: [PATCH] Using AM_CFLAGS instead of CFLAGS. 1.8.3 closer.

---
 CHANGELOG         |    2 ++
 lib/Makefile.am   |    4 ++--
 ztest/Makefile.am |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 15151b3..936bf8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 1.8.3 2001/11/19
+
 YAZ client enables setnames only if target supports it.
 
 *** ZOOM. Prefix for ZOOM definitions changed from Z3950_ to ZOOM_.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 868f832..b54511c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.16 2001-11-13 23:00:42 adam Exp $
+## $Id: Makefile.am,v 1.17 2001-11-19 09:16:37 adam Exp $
 
 if ISTHR
 extra=libyazthread.la
@@ -31,7 +31,7 @@ $(srcdir)/xmalloc.c: $(top_srcdir)/util/xmalloc.c
 
 LDFLAGS=-version-info 1:0:0
 
-CFLAGS =-DTRACE_XMALLOC=2 -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
+AM_CFLAGS=-DTRACE_XMALLOC=2 -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
 
 bin_SCRIPTS = yaz-config
 
diff --git a/ztest/Makefile.am b/ztest/Makefile.am
index d0fef0b..776a94e 100644
--- a/ztest/Makefile.am
+++ b/ztest/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2001-10-06 08:16:30 adam Exp $
+## $Id: Makefile.am,v 1.8 2001-11-19 09:16:37 adam Exp $
 
 bin_PROGRAMS=yaz-ztest
 
@@ -11,6 +11,6 @@ extra=../lib/libyazthread.la
 endif
 yaz_ztest_LDADD=$(extra) ../lib/libyaz.la $(LIBTHREAD)
 
-CFLAGS=@CFLAGSTHREADS@
+AM_CFLAGS=@CFLAGSTHREADS@
 
 INCLUDES=-I$(top_srcdir)/include
-- 
1.7.10.4