Merge branch 'automake-am11-am12'

[ngircd-alex.git] / src / ngircd / Makefile.ng

diff --git a/src/ngircd/Makefile.ng b/src/ngircd/Makefile.ng
index db3ecfe9ec7072ed1a6d9c44075893a16f9a2b3e..5c8533523b4430c7055d1b21e625331670c8950c 100644 (file)
--- a/src/ngircd/Makefile.ng
+++ b/src/ngircd/Makefile.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -11,7 +11,9 @@
 
 __ng_Makefile_am_template__
 
-INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
+EXTRA_DIST = Makefile.ng
+
+AM_CPPFLAGS = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
 
 LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
  -varuse -retvalother -emptyret -unrecog
@@ -120,7 +122,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; \