More splint fiddles.

CVS patchset: 5908
CVS date: 2002/11/30 22:15:29

7 files changed, 21 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index e298f42ba..d18f672a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ INCLUDES = \
 	@WITH_LIBELF_INCLUDE@ \
 	@INCPATH@
 
-myLDFLAGS = @LDFLAGS_STATIC@
+myLDFLAGS = # @LDFLAGS_STATIC@
 
 # XXX libtool can/should generate dependent libs.
 # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
diff --git a/lib/.lclintrc b/lib/.splintrc
index 169628e33..d3df363f0 100644
--- a/lib/.lclintrc
+++ b/lib/.splintrc
@@ -1,4 +1,4 @@
--I. -I.. -I../build -I../rpmdb -I../rpmio -I../beecrypt -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE
+-I. -I.. -I../build -I../rpmdb -I../rpmio -I../beecrypt -I../popt -I../elfutils/libelf -DHAVE_CONFIG_H -D_GNU_SOURCE
 
 +partial
 +forcehints
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e6f30adf6..fcefb84e2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+LINT = splint
+
 INCLUDES = -I. \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/build \
@@ -25,7 +27,7 @@ mylibpaths = \
 	-L$(top_builddir)/rpmio \
 	-L$(top_builddir)/popt
 
-mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
+mylibs = -lrpm -lrpmdb -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
 LIBS =
 
 lib_LTLIBRARIES = librpm.la
@@ -83,9 +85,9 @@ rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
 sources:
 	@echo $(librpm_la_SOURCES:%=lib/%)
 
-.PHONY:	lclint
-lclint:
-	lclint $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
+.PHONY:	lint
+lint:
+	$(LINT) $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
 
 th: th.c librpm.la
 	$(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
diff --git a/rpmdb/.lclintrc b/rpmdb/.splintrc
index 4689c17ca..baa53e40c 100644
--- a/rpmdb/.lclintrc
+++ b/rpmdb/.splintrc
@@ -1,4 +1,4 @@
--I. -I.. -I../build -I../lib -I../rpmio -I../beecrypt -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE
+-I. -I.. -I../build -I../lib -I../rpmio -I../beecrypt -I../popt -I../elfutils/libelf -DHAVE_CONFIG_H -D_GNU_SOURCE
 
 +partial
 +forcehints
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 9201924fc..c6026e85d 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+LINT = splint
+
 INCLUDES = -I. \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/lib \
@@ -28,7 +30,7 @@ mylibpaths = \
 	-L$(top_builddir)/rpmio \
 	-L$(top_builddir)/popt
 
-mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
+mylibs = -lrpm -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
 LIBS =
 
 DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs)
@@ -40,7 +42,7 @@ librpmdb_la_SOURCES = \
 	poptDB.c rpmhash.c rpmdb.c \
 	tagname.c tagtbl.c
 librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
-librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) @WITH_LIBELF_LIB@
+librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
 librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created
 
 # XXX make sure that db.h symlink is generated
@@ -92,9 +94,9 @@ rpmdb.lcd: Makefile.am ${librpmdb_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS
 sources:
 	@echo $(librpmdb_la_SOURCES:%=rpmdb/%)
 
-.PHONY:	lclint
-lclint:
-	lclint $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES)
+.PHONY:	lint
+lint:
+	$(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES)
 
 tdbi: librpmdb.la tdbi.o
 	$(LINK) -all-static $@.o $< $(mylibpaths) $(mylibs) $(LIBS)
diff --git a/rpmio/.lclintrc b/rpmio/.splintrc
index d82306b54..d82306b54 100644
--- a/rpmio/.lclintrc
+++ b/rpmio/.splintrc
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index c4efe0ae3..4f25b38ab 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+LINT = splint
+
 EXTRA_DIST = tdigest.c tdir.c tficl.c tfts.c tglob.c tinv.c tkey.c trpmio.c
 
 EXTRA_PROGRAMS = tdigest tdir tfts tglob tinv tkey tring trpmio dumpasn1
@@ -55,9 +57,9 @@ rpmio.lcd: Makefile.am ${librpmio_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS
 sources:
 	@echo $(librpmio_la_SOURCES:%=rpmio/%)
 
-.PHONY:	lclint
-lclint:
-	lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
+.PHONY:	lint
+lint:
+	$(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
 
 tdigest_SOURCES = tdigest.c
 tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la