Fix some "make lint" problems

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2674 fd59a12c-fef9-0310-b244-a6a79926bd2f

diff --git a/exec/Makefile.am b/exec/Makefile.am
index 0da4d990c91d19282b55331b19d019b93aadc169..fe054ca94991a53a1a1a3794c2e5db420621ea63 100644 (file)
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -150,7 +150,7 @@ endif
 endif
 
 lint:
-       -splint $(LINT_FLAGS) $(CFLAGS) *.c
+       -splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) *.c
 
 all-local: $(LCRSO_OBJS) $(LCRSO) $(SHARED_LIBS)
        @echo Built corosync Executive

diff --git a/services/Makefile.am b/services/Makefile.am
index f3a9f78786d3b274edd83a7ea6331fb7f75a1d92..06365db5c64d48ae9fb978bfc77c37d35bfcad55 100644 (file)
--- a/services/Makefile.am
+++ b/services/Makefile.am
@@ -80,7 +80,7 @@ endif
        $(CC) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
 
 lint:
-       -splint $(LINT_FLAGS) $(CFLAGS) *.c
+       -splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) *.c
 
 all-local: $(LCRSO_OBJS) $(LCRSO)
        @echo Built Service Engines

diff --git a/test/Makefile.am b/test/Makefile.am
index 2a88908da0f9ae7b958fa0e0fb4048182f6b4081..d87ceefdf9ded1e61b8e9dc8c035b992d92e4474 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,7 +31,7 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 MAINTAINERCLEANFILES    = Makefile.in
-INCLUDES                       = -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES                       = -I$(top_builddir)/include/corosync -I$(top_srcdir)/include
 
 noinst_PROGRAMS                = testevs evsbench evsverify cpgverify testcpg testcpg2 cpgbench testconfdb     \
                        logsysbench logsysrec testquorum testvotequorum1 testvotequorum2        \
@@ -88,8 +88,13 @@ logsys_t2_LDFLAGS    = -L../exec
 testsam_LDADD          = -lsam
 testsam_LDFLAGS                = -L../lib
 
+LINT_FILES1:=$(filter-out sa_error.c, $(wildcard *.c))
+LINT_FILES2:=$(filter-out testevsth.c, $(LINT_FILES1))
+LINT_FILES:=$(filter-out testparse.c, $(LINT_FILES2))
+
+
 lint:
-       -splint $(LINT_FLAGS) $(CFLAGS) *.c
+       -for f in $(LINT_FILES) ; do echo Splint $$f ; splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) $$f ; done
 
 clean-local:
        rm -f fdata