repo: ngircd
action: commit
revision: 
path_from: 
revision_from: d4df626d8872576b3fb54280764f16f3b94d783b:
path_to: 
revision_to: 

commit d4df626d8872576b3fb54280764f16f3b94d783b
Author: Alexander Barton 
Date:   Mon Sep 24 17:45:15 2012 +0200

    automake: don't use INCLUDES, it's AM_CPPFLAGS nowadays

diff --git a/src/ipaddr/Makefile.am b/src/ipaddr/Makefile.am

--- 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

--- 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

--- 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

--- 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

-----END OF PAGE-----