diff --git a/Makefile.am b/Makefile.am index 6a23cc3b2..cf2cdd13b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ # Top level Makefile for rpm -LINT = splint - CLEANFILES = EXTRA_DIST = CHANGES ChangeLog CREDITS Doxyheader GROUPS INSTALL \ autodeps autogen.sh \ @@ -89,23 +87,6 @@ macros: $(top_srcdir)/macros.in CLEANFILES += macros.tmp macros EXTRA_DIST += macros.in -.PHONY: splint -splint: - splint \ - -load build/rpmbuild.lcd \ - -load lib/rpmlib.lcd \ - -load rpmdb/rpmdb.lcd \ - -load rpmio/rpmio.lcd \ - $(DEFS) $(AM_CPPFLAGS) rpmqv.c $(rpmb_SOURCES) - -.PHONY: lint -lint: - $(LINT) -Dlint $(DEFS) $(AM_CPPFLAGS) rpmqv.c $(rpmb_SOURCES) \ - `make -s sources -C build` \ - `make -s sources -C lib` \ - `make -s sources -C rpmdb` \ - `make -s sources -C rpmio` - pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR) rpmvardir = $(localstatedir)/lib/rpm @@ -221,11 +202,6 @@ doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt-@VERSION@ $(MKDIR_P) $@ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@ -cscope: - @CSCOPE@ -b -R - -cref: ctags cscope - .PHONY: ChangeLog ChangeLog: hg log --no-merge -v > ChangeLog diff --git a/build/Makefile.am b/build/Makefile.am index e1f988f10..a09cf8a9d 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpmbuild library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ @@ -31,16 +29,3 @@ librpmbuild_la_LDFLAGS = -release 4.4 \ @WITH_POPT_LIB@ \ @WITH_LIBELF_LIB@ \ @WITH_MAGIC_LIB@ - -#BUILT_SOURCES = rpmbuild.lcd - -rpmbuild.lcd: Makefile.am ${librpmbuild_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -lclint ${DEFS} ${AM_CPPFLAGS} ${librpmbuild_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmbuild_la_SOURCES:%=build/%) - -.PHONY: lint -lint: - $(LINT) ${DEFS} ${AM_CPPFLAGS} ${librpmbuild_la_SOURCES} diff --git a/lib/Makefile.am b/lib/Makefile.am index db9a51950..968ea4549 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/rpmdb \ @@ -72,18 +70,7 @@ getdate.c: getdate.y fi ;\ fi -BUILT_SOURCES = getdate.c # rpmlib.lcd - -rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS} - -lclint ${DEFS} ${AM_CPPFLAGS} ${librpm_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpm_la_SOURCES:%=lib/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpm_la_SOURCES) +BUILT_SOURCES = getdate.c if SELINUX check_PROGRAMS += setfiles diff --git a/lua/Makefile.am b/lua/Makefile.am index 3154095fc..5fb0641cc 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -1,6 +1,3 @@ - -LINT = splint - noinst_LTLIBRARIES = liblua.la noinst_PROGRAMS = lua/lua luac/luac @@ -83,73 +80,3 @@ liblua_la_SOURCES = \ local/linit.lch: local/linit.lua bin2c local/linit.lua > local/linit.lch - -# XXX to avoid local/linit.lch syntax problem. -# -# local/linit.c \ -# lib/lstrlib.c \ -# -LUA_SPLINT_SRCS = \ - lua/lua.c \ - include/lauxlib.h \ - include/lua.h \ - include/lualib.h \ - lib/lauxlib.c \ - lib/lbaselib.c \ - lib/ldblib.c \ - lib/liolib.c \ - lib/loadlib.c \ - lib/lmathlib.c \ - lib/ltablib.c \ - local/lposix.h \ - local/lposix.c \ - local/lrexlib.h \ - local/lrexlib.c \ - lapi.c \ - lapi.h \ - lcode.c \ - lcode.h \ - ldebug.c \ - ldebug.h \ - ldo.c \ - ldo.h \ - ldump.c \ - lfunc.c \ - lfunc.h \ - lgc.c \ - lgc.h \ - llex.c \ - llex.h \ - llimits.h \ - lmem.c \ - lmem.h \ - lobject.c \ - lobject.h \ - lopcodes.c \ - lopcodes.h \ - lparser.c \ - lparser.h \ - lstate.c \ - lstate.h \ - lstring.c \ - lstring.h \ - ltable.c \ - ltable.h \ - ltests.c \ - ltm.c \ - ltm.h \ - lundump.c \ - lundump.h \ - lvm.c \ - lvm.h \ - lzio.c \ - lzio.h - -.PHONY: sources -sources: - @echo $(LUA_SPLINT_SRCS:%=lua/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(LUA_SPLINT_SRCS) - diff --git a/python/Makefile.am b/python/Makefile.am index b636b905a..867fc3e8f 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - if PYTHON pylibdir = @WITH_PYTHON_LIB@ pyincdir = @WITH_PYTHON_INCLUDE@ @@ -48,13 +46,4 @@ _rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ # rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \ # rpmps-py.c rpmrc-py.c rpmte-py.c rpmts-py.c # rpmmodule.c header-py.c -splint_srcs = \ - rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ - rpmfi-py.c rpmmi-py.c rpmps-py.c rpmrc-py.c rpmte-py.c rpmts-py.c \ - spec-py.c - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(splint_srcs) - endif diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index 1f66a9ba0..683a3a732 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/build \ @@ -172,17 +170,6 @@ rpmdb_verify_LDADD = \ BUILT_SOURCES = tagtbl.c -rpmdb.lcd: Makefile.am ${librpmdb_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -splint ${DEFS} ${AM_CPPFLAGS} ${librpmdb_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmdb_la_SOURCES:%=rpmdb/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpmdb_la_SOURCES) - check_PROGRAMS += tdbi tdbi_SOURCES = tdbi.c # tdbi_LDFLAGS = @LDFLAGS_STATIC@ diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 2f04f84f3..27b79bda0 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ @WITH_BEECRYPT_INCLUDE@ \ @@ -32,19 +30,6 @@ librpmio_la_LDFLAGS = -release 4.4 \ @WITH_ZLIB_LIB@ \ -lpthread -#BUILT_SOURCES = rpmio.lcd - -rpmio.lcd: Makefile.am ${librpmio_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -lclint -load ../beecrypt/beecrypt.lcd $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmio_la_SOURCES:%=rpmio/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) - check_PROGRAMS = check_PROGRAMS += tax