commit - eed8a4ee6e2ba814d2cc6041eb9ac8df10d01e9e
commit + d4df626d8872576b3fb54280764f16f3b94d783b
blob - 6ce299f2c9afc0b65edfcafd4b27cfc807b317ed
blob + e898d64b9857e8ba0a5f8fd21c4ff626b07a068b
--- src/ipaddr/Makefile.am
+++ 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
 
blob - 3a411a964b266a2ab9874342ee618018c953ba86
blob + b40913500c614e95c26dd0be4679f816ebdef651
--- src/ngircd/Makefile.am
+++ 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; \
blob - 9dc76a7d90f47e5a8b8c79b7d22d8fbdd52b6ca2
blob + 5a2a94124a1ea9a3bbf8afa2c93ac8bcd08234bd
--- src/testsuite/Makefile.am
+++ 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 \
blob - 8d6cda46656b5d67a6bc8244e6fadd8544b876e9
blob + a515b4d38aa72db0957371224e46ad16f98b6fcb
--- src/tool/Makefile.am
+++ 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