From d4df626d8872576b3fb54280764f16f3b94d783b Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Mon, 24 Sep 2012 17:45:15 +0200 Subject: [PATCH] automake: don't use INCLUDES, it's AM_CPPFLAGS nowadays --- src/ipaddr/Makefile.am | 2 +- src/ngircd/Makefile.am | 4 ++-- src/testsuite/Makefile.am | 2 +- src/tool/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ipaddr/Makefile.am b/src/ipaddr/Makefile.am index 6ce299f2..e898d64b 100644 --- a/src/ipaddr/Makefile.am +++ b/src/ipaddr/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = ../portab/ansi2knr -INCLUDES = -I$(srcdir)/../portab +AM_CPPFLAGS = -I$(srcdir)/../portab noinst_LIBRARIES = libngipaddr.a diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am index 3a411a96..b4091350 100644 --- a/src/ngircd/Makefile.am +++ b/src/ngircd/Makefile.am @@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = ../portab/ansi2knr -INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr +AM_CPPFLAGS = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \ -varuse -retvalother -emptyret -unrecog @@ -120,7 +120,7 @@ lint: for f in *.c; do \ echo "checking $$f ..."; \ splint $$f $(LINTARGS) -I$(srcdir) -I$(srcdir)/.. \ - $(INCLUDES) $(AM_CFLAGS) >lint.out 2>&1; \ + $(AM_CPPFLAGS) $(AM_CFLAGS) >lint.out 2>&1; \ grep "no warnings" lint.out > /dev/null 2>&1; \ if [ $$? -ne 0 ]; then \ waswarning=1; \ diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am index 9dc76a7d..5a2a9412 100644 --- a/src/testsuite/Makefile.am +++ b/src/testsuite/Makefile.am @@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = ../portab/ansi2knr -INCLUDES = -I$(srcdir)/../portab +AM_CPPFLAGS = -I$(srcdir)/../portab EXTRA_DIST = \ README functions.inc getpid.sh \ diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am index 8d6cda46..a515b4d3 100644 --- a/src/tool/Makefile.am +++ b/src/tool/Makefile.am @@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = ../portab/ansi2knr -INCLUDES = -I$(srcdir)/../portab +AM_CPPFLAGS = -I$(srcdir)/../portab noinst_LIBRARIES = libngtool.a -- 2.39.2