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 8ee044d9e1ed4c95bd2a6d5e93746ee042c2ef27..5c8533523b4430c7055d1b21e625331670c8950c 100644 (file)
--- a/src/ngircd/Makefile.ng
+++ b/src/ngircd/Makefile.ng
@@ -13,7 +13,7 @@ __ng_Makefile_am_template__
 
 EXTRA_DIST = Makefile.ng
 
 
 EXTRA_DIST = Makefile.ng
 

-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
 
 LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
  -varuse -retvalother -emptyret -unrecog


@@ -122,7 +122,7 @@ lint:
        for f in *.c; do \
         echo "checking $$f ..."; \
         splint $$f $(LINTARGS) -I$(srcdir) -I$(srcdir)/.. \
        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; \
         grep "no warnings" lint.out > /dev/null 2>&1; \
         if [ $$? -ne 0 ]; then \
          waswarning=1; \