diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | beecrypt/Makefile.am | 3 | ||||
| -rw-r--r-- | beecrypt/configure.ac | 7 | ||||
| -rw-r--r-- | build/Makefile.am | 22 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | file/Makefile.am | 5 | ||||
| -rw-r--r-- | file/configure.ac | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 9 | ||||
| -rw-r--r-- | popt/.splintrc (renamed from popt/.lclintrc) | 0 | ||||
| -rw-r--r-- | popt/Makefile.am | 18 | ||||
| -rwxr-xr-x | popt/configure.ac | 7 | ||||
| -rw-r--r-- | rpm.spec.in | 40 | ||||
| -rw-r--r-- | rpmdb/Makefile.am | 21 | ||||
| -rw-r--r-- | rpmdb/tdbi.c | 7 | ||||
| -rw-r--r-- | rpmdb/tjfn.c | 7 | ||||
| -rw-r--r-- | rpmio/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 | ||||
| -rw-r--r-- | zlib/.splintrc (renamed from zlib/.lclintrc) | 0 | ||||
| -rw-r--r-- | zlib/Makefile.am | 8 |
19 files changed, 102 insertions, 89 deletions
@@ -38,6 +38,7 @@ - move libfmagic to librpmio. - use libtool-1.4.3, autoconf-2.56. - add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64. + - use usrlib_LTLIBRARIES to install directly in /usr/lib64 instead. 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/beecrypt/Makefile.am b/beecrypt/Makefile.am index 57b9837c9..6ddc27dac 100644 --- a/beecrypt/Makefile.am +++ b/beecrypt/Makefile.am @@ -44,7 +44,8 @@ BEECRYPT_OBJECTS = aes.lo aesopt.lo base64.lo beecrypt.lo blockmode.lo blockpad. BEECRYPT_JAVA_OBJECTS = javaglue.lo -lib_LTLIBRARIES = libbeecrypt.la +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = libbeecrypt.la libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c javaglue.c md5.c memchunk.c mp32.c mp32barrett.c mp32number.c mp32prime.c mtprng.c rsa.c rsakp.c rsapk.c sha1.c sha256.c timestamp.c diff --git a/beecrypt/configure.ac b/beecrypt/configure.ac index 1642a844a..1c4ff071d 100644 --- a/beecrypt/configure.ac +++ b/beecrypt/configure.ac @@ -463,6 +463,13 @@ fi # Checks for symbol names (used in the assembler symbol names) AH_TEMPLATE([LEADING_UNDERSCORE],[Define to 1 if your system compiles object names with leading underscores]) +dnl XXX Choose /usr/lib or /usr/lib64 for library installs. +MARK64= +case "${target_cpu}" in +x86_64*) MARK64=64 ;; +esac +AC_SUBST(MARK64) + case $target_os in cygwin* | darwin*) AC_DEFINE([LEADING_UNDERSCORE]) diff --git a/build/Makefile.am b/build/Makefile.am index 4c41bf01e..9d78ff98c 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -15,42 +15,30 @@ INCLUDES = -I. \ LIBS = -#FILELOBJS = $(shell cat $(top_builddir)/file/listobjs) - pkgincdir = $(pkgincludedir) pkginc_HEADERS = argv.h rpmbuild.h rpmfc.h rpmfile.h rpmspec.h noinst_HEADERS = buildio.h -lib_LTLIBRARIES = librpmbuild.la +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = librpmbuild.la librpmbuild_la_SOURCES = \ argv.c build.c expression.c files.c misc.c names.c pack.c \ parseBuildInstallClean.c parseChangelog.c parseDescription.c \ parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \ parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c -librpmbuild_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/lib/librpm.la -#librpmbuild_la_LIBADD = $(FILELOBJS) -#librpmbuild_la_DEPENDENCIES = .created +librpmbuild_la_LDFLAGS = -release @VERSION@ $(top_builddir)/lib/librpm.la rpmfile.h: @ln -sf $(top_builddir)/file/file.h $@ -#$(top_builddir)/file/listobjs: -# ${MAKE} -C $(top_builddir)/file listobjs -# -#.created: rpmfile.h $(top_builddir)/file/listobjs -# for lo in $(FILELOBJS); do \ -# [ -f $$lo ] || $(LN_S) $(top_builddir)/file/$$lo $$lo ; \ -# done -# touch $@ - rpmfc.c: rpmfile.h clean-local: rm -f *.o rpmfile.h # .created $(FILELOBJS) # XXX Add internal libtool dependence -install-data-local: - @cd $(DESTDIR)/$(libdir) && \ +install-data-local: install-usrlibLTLIBRARIES + @cd $(DESTDIR)/$(usrlibdir) && \ sed -e "s|^dependency_libs='|& -lrpm-@VERSION@|" < librpmbuild.la > .librpmbuild.la && \ mv .librpmbuild.la librpmbuild.la diff --git a/configure.ac b/configure.ac index 0155857a2..4fc8589e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1105,13 +1105,12 @@ else ln -s ${srcdir}/autodeps/none ./find-requires fi -dnl XXX hack in explicit -L/lib64 -L/usr/lib64 on x86_64 -HACK_LIBTOOLPATH= -case "${build_cpu}" in -x86_64*) HACK_LIBTOOLPATH="-L/lib64 -L/usr/lib64" ;; +dnl XXX Choose /usr/lib or /usr/lib64 for library installs. +MARK64= +case "${target_cpu}" in +x86_64*) MARK64=64 ;; esac -AC_SUBST(HACK_LIBTOOLPATH) - +AC_SUBST(MARK64) dnl Determine the canonical arch-vendor-os for the build machine case "${build_cpu}" in diff --git a/file/Makefile.am b/file/Makefile.am index 883f0ca98..6741db3c5 100644 --- a/file/Makefile.am +++ b/file/Makefile.am @@ -10,11 +10,12 @@ BUILT_SOURCES = listobjs $(man_MANS) magic magic.mgc magic.mime.mgc noinst_HEADERS = debug.h names.h patchlevel.h readelf.h system.h tar.h \ file.h -pkgincdir = @includedir@/fmagic +#pkgincdir = @includedir@/fmagic #pkginc_HEADERS = file.h +#usrlibdir = $(libdir)@MARK64@ +#usrlib_LTLIBRARIES = libfmagic.la -#lib_LTLIBRARIES = libfmagic.la noinst_LTLIBRARIES = libfmagic.la libfmagic_la_SOURCES = \ diff --git a/file/configure.ac b/file/configure.ac index ef6017351..890b50f02 100644 --- a/file/configure.ac +++ b/file/configure.ac @@ -60,6 +60,13 @@ if test "$ac_cv_prog_gcc" = yes; then fi export CFLAGS +dnl XXX Choose /usr/lib or /usr/lib64 for library installs. +MARK64= +case "${target_cpu}" in +x86_64*) MARK64=64 ;; +esac +AC_SUBST(MARK64) + dnl Checks for headers AC_HEADER_STDC AC_HEADER_STDINT diff --git a/lib/Makefile.am b/lib/Makefile.am index 6d2ce2e2a..ffe6e083d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -30,7 +30,8 @@ mylibpaths = \ mylibs = -lrpm -lrpmdb -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@ LIBS = -lib_LTLIBRARIES = librpm.la +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = librpm.la librpm_la_SOURCES = \ cpio.c depends.c formats.c fs.c fsm.c getdate.c \ manifest.c misc.c package.c \ @@ -39,11 +40,11 @@ librpm_la_SOURCES = \ rpmlead.c rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \ signature.c stringbuf.c transaction.c \ verify.c -librpm_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/rpmdb/librpmdb.la +librpm_la_LDFLAGS = -release @VERSION@ $(top_builddir)/rpmdb/librpmdb.la # XXX Add internal libtool dependence -install-data-local: - @cd $(DESTDIR)/$(libdir) && \ +install-data-local: install-usrlibLTLIBRARIES + @cd $(DESTDIR)/$(usrlibdir) && \ sed -e "s|^dependency_libs='|& -lrpmdb-@VERSION@ -lrpmio-@VERSION@ -lpopt|" < librpm.la > .librpm.la && \ mv .librpm.la librpm.la diff --git a/popt/.lclintrc b/popt/.splintrc index e4294788a..e4294788a 100644 --- a/popt/.lclintrc +++ b/popt/.splintrc diff --git a/popt/Makefile.am b/popt/Makefile.am index b947f129d..5d9862c0f 100644 --- a/popt/Makefile.am +++ b/popt/Makefile.am @@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign +LINT = splint + EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \ testit.sh test-poptrc test3-data/0* \ po/*.in po/*.po po/popt.pot \ @@ -16,13 +18,13 @@ noinst_HEADERS = findme.h poptint.h system.h noinst_PROGRAMS = test1 test2 test3 test1_SOURCES = test1.c test1_LDFLAGS = -all-static -test1_LDADD = $(lib_LTLIBRARIES) +test1_LDADD = $(usrlib_LTLIBRARIES) test2_SOURCES = test2.c test2_LDFLAGS = -all-static -test2_LDADD = $(lib_LTLIBRARIES) +test2_LDADD = $(usrlib_LTLIBRARIES) test3_SOURCES = test3.c test3_LDFLAGS = -all-static -test3_LDADD = $(lib_LTLIBRARIES) +test3_LDADD = $(usrlib_LTLIBRARIES) noinst_SCRIPTS = testit.sh @@ -32,7 +34,9 @@ test1="./test1" TESTS = testit.sh include_HEADERS = popt.h -lib_LTLIBRARIES = libpopt.la + +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = libpopt.la libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c man_MANS = popt.3 @@ -46,9 +50,9 @@ popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS} sources: @echo $(libpopt_la_SOURCES:%=popt/%) -.PHONY: lclint -lclint: - lclint ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES} +.PHONY: lint +lint: + $(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES} CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION)) diff --git a/popt/configure.ac b/popt/configure.ac index ce49069c4..d8dcceece 100755 --- a/popt/configure.ac +++ b/popt/configure.ac @@ -51,6 +51,13 @@ else fi AC_SUBST(TARGET) +dnl XXX Choose /usr/lib or /usr/lib64 for library installs. +MARK64= +case "${target_cpu}" in +x86_64*) MARK64=64 ;; +esac +AC_SUBST(MARK64) + AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h) AC_MSG_CHECKING(for /usr/ucblib in LIBS) if test -d /usr/ucblib ; then diff --git a/rpm.spec.in b/rpm.spec.in index 563445f6d..2ff3dff63 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -16,7 +16,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.15 +Release: 0.16 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -163,9 +163,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/rpm mkdir -p $RPM_BUILD_ROOT/var/spool/repackage mkdir -p $RPM_BUILD_ROOT/var/lib/rpm for dbi in \ - Basenames Conflictname Dirnames Group Installtid Name Providename \ - Provideversion Removetid Requirename Requireversion Triggername \ - Sigmd5 Sha1header Filemd5s Packages \ + Basenames Conflictname Dirnames Group Installtid Name Packages \ + Providename Provideversion Requirename Requireversion Triggername \ + Filemd5s Pubkeys Sha1header Sigmd5 \ __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \ __db.008 __db.009 do @@ -179,12 +179,12 @@ gzip -9n apidocs/man/man*/* || : %endif # XXX FIXME: hack to get libraries in the right place -if [ ! -d $RPM_BUILD_ROOT/%{__prefix}/%{_lib} ]; then - mkdir -p $RPM_BUILD_ROOT/%{__prefix}/%{_lib} - mv $RPM_BUILD_ROOT/usr/lib/*so* $RPM_BUILD_ROOT/%{__prefix}/%{_lib} - mv $RPM_BUILD_ROOT/usr/lib/*.a $RPM_BUILD_ROOT/%{__prefix}/%{_lib} - mv $RPM_BUILD_ROOT/usr/lib/*.la $RPM_BUILD_ROOT/%{__prefix}/%{_lib} -fi +#if [ ! -d $RPM_BUILD_ROOT/%{__prefix}/%{_lib} ]; then +# mkdir -p $RPM_BUILD_ROOT/%{__prefix}/%{_lib} +# mv $RPM_BUILD_ROOT/usr/lib/*so* $RPM_BUILD_ROOT/%{__prefix}/%{_lib} +# mv $RPM_BUILD_ROOT/usr/lib/*.a $RPM_BUILD_ROOT/%{__prefix}/%{_lib} +# mv $RPM_BUILD_ROOT/usr/lib/*.la $RPM_BUILD_ROOT/%{__prefix}/%{_lib} +#fi # Get rid of unpackaged files { cd $RPM_BUILD_ROOT @@ -273,24 +273,7 @@ exit 0 %attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/spool/repackage %define rpmdbattr %attr(0644, @RPMUSER@, @RPMGROUP@) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) -%rpmdbattr /var/lib/rpm/Basenames -%rpmdbattr /var/lib/rpm/Conflictname -%rpmdbattr /var/lib/rpm/__db.0* -%rpmdbattr /var/lib/rpm/Dirnames -%rpmdbattr /var/lib/rpm/Filemd5s -%rpmdbattr /var/lib/rpm/Group -%rpmdbattr /var/lib/rpm/Installtid -%rpmdbattr /var/lib/rpm/Name -%rpmdbattr /var/lib/rpm/Packages -%rpmdbattr /var/lib/rpm/Providename -%rpmdbattr /var/lib/rpm/Provideversion -%rpmdbattr /var/lib/rpm/Removetid -%rpmdbattr /var/lib/rpm/Requirename -%rpmdbattr /var/lib/rpm/Requireversion -%rpmdbattr /var/lib/rpm/Sigmd5 -%rpmdbattr /var/lib/rpm/Sha1header -%rpmdbattr /var/lib/rpm/Triggername - +%rpmdbattr /var/lib/rpm/* %endif %rpmattr %{__prefix}/bin/rpm2cpio @@ -501,6 +484,7 @@ exit 0 - move libfmagic to librpmio. - use libtool-1.4.3, autoconf-2.56. - add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64. +- use usrlib_LTLIBRARIES to install directly in /usr/lib64 instead. * Sat Nov 30 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.14 - upgrade to elfutils-0.63. diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index ea929b1cd..951ce546d 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -25,23 +25,26 @@ pkgincdir = $(pkgincludedir) pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h rpmhash.h noinst_HEADERS = fprint.h header_internal.h legacy.h -mylibpaths = \ - -L$(top_builddir)/lib \ - -L$(top_builddir)/rpmio \ - -L$(top_builddir)/popt +#mylibpaths = \ +# -L$(top_builddir)/lib \ +# -L$(top_builddir)/rpmio \ +# -L$(top_builddir)/popt + +#mylibs = -lrpm -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@ +mylibs = librpmdb.la -mylibs = -lrpm -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@ LIBS = DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs) -lib_LTLIBRARIES = librpmdb.la +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = librpmdb.la librpmdb_la_SOURCES = \ dbconfig.c fprint.c \ hdrNVR.c header.c header_internal.c legacy.c merge.c \ poptDB.c rpmhash.c rpmdb.c \ tagname.c tagtbl.c -librpmdb_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la @WITH_LIBELF_LIB@ @libdb3@ +librpmdb_la_LDFLAGS = -release @VERSION@ $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la @WITH_LIBELF_LIB@ @libdb3@ librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created @@ -49,8 +52,8 @@ librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created dbconfig.c: db.h # XXX Add internal libtool dependence -install-data-local: - @cd $(DESTDIR)/$(libdir) && \ +install-data-local: install-usrlibLTLIBRARIES + @cd $(DESTDIR)/$(usrlibdir) && \ sed -e "s|^dependency_libs='|& -lrpmio-@VERSION@|" < librpmdb.la > .librpmdb.la && \ mv .librpmdb.la librpmdb.la diff --git a/rpmdb/tdbi.c b/rpmdb/tdbi.c index a7d2046a0..300817c6b 100644 --- a/rpmdb/tdbi.c +++ b/rpmdb/tdbi.c @@ -25,7 +25,12 @@ main(int argc, char *argv[]) exit (1); } - if ((rc = db->open(db, dbfile, NULL, DB_UNKNOWN, DB_RDONLY, 0664)) != 0) { +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) + rc = db->open(db, txnid, dbfile, NULL, DB_UNKNOWN, DB_RDONLY, 0664); +#else + rc = db->open(db, dbfile, NULL, DB_UNKNOWN, DB_RDONLY, 0664); +#endif + if (rc != 0) { db->err(db, rc, "db->open"); if (!ec) ec = rc; goto err; diff --git a/rpmdb/tjfn.c b/rpmdb/tjfn.c index 435894489..a3b5cf5f2 100644 --- a/rpmdb/tjfn.c +++ b/rpmdb/tjfn.c @@ -69,7 +69,12 @@ db_open(const char * dbfn, DB_ENV * dbenv, DB ** dbp) goto err; } - if ((ret = db->open(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) + ret = db->open(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664); +#else + ret = db->open(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664); +#endif + if (ret != 0) { db->err(db, ret, "db->open(%s)", dbfn); goto err; } diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 9adbf58db..2e350e8a3 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -22,17 +22,18 @@ noinst_HEADERS = rpmio_internal.h BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs) -lib_LTLIBRARIES = librpmio.la +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = digest.c fts.c macro.c \ rpmio.c rpmlog.c rpmmalloc.c \ rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c -librpmio_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/file/libfmagic.la @WITH_ZLIB_LIB@ -lrt -lpthread +librpmio_la_LDFLAGS = -release @VERSION@ $(top_builddir)/file/libfmagic.la @WITH_ZLIB_LIB@ -lrt -lpthread librpmio_la_LIBADD = $(BEECRYPTLOBJS) librpmio_la_DEPENDENCIES = .created # XXX Add internal libtool dependence -install-data-local: - @cd $(DESTDIR)/$(libdir) && \ +install-data-local: install-usrlibLTLIBRARIES + @cd $(DESTDIR)/$(usrlibdir) && \ sed -e "s|^dependency_libs='|& -lpopt|" < librpmio.la > .librpmio.la && \ mv .librpmio.la librpmio.la diff --git a/tools/Makefile.am b/tools/Makefile.am index 1b7ae1bca..5c0cfbad4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,12 +20,7 @@ EXTRA_DIST = rpminject.c rpmsort.c hashtab.h EXTRA_PROGRAMS = rpminject rpmsort LDADD = \ - $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmdb/librpmdb.la \ - $(top_builddir)/rpmio/librpmio.la \ - $(top_builddir)/popt/libpopt.la \ - @WITH_LIBELF_LIB@ \ @INTLLIBS@ noinst_PROGRAMS = \ @@ -39,13 +34,15 @@ bin_PROGRAMS = rpmgraph convertdb1_SOURCES = convertdb1.c debugedit_SOURCES = debugedit.c hashtab.c + javadeps_SOURCES = javadeps.c rpmcache_SOURCES = rpmcache.c #rpmcache_LDFLAGS = @LDFLAGS_STATIC@ rpmdeps_SOURCES = rpmdeps.c -#rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la +rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la +#rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ rpmgraph_SOURCES = rpmgraph.c #rpmgraph_LDFLAGS = @LDFLAGS_STATIC@ diff --git a/zlib/.lclintrc b/zlib/.splintrc index 1919ecfd8..1919ecfd8 100644 --- a/zlib/.lclintrc +++ b/zlib/.splintrc diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 9d1c53b0c..3cd75f1fb 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign +LINT = splint + EXTRA_DIST = algorithm.txt ChangeLog Doxyfile FAQ INDEX README \ zlib.3 zlib.spec \ amiga/* contrib/* msdos/* nt/* os2/* @@ -33,9 +35,9 @@ zlib.lcd: Makefile.am ${libz_la_SOURCES} ${noinst_HEADERS} sources: @echo $(libz_la_SOURCES:%=zlib/%) -.PHONY: lclint -lclint: - lclint $(DEFS) $(INCLUDES) $(libz_la_SOURCES) +.PHONY: lint +lint: + $(LINT) $(DEFS) $(INCLUDES) $(libz_la_SOURCES) .PHONY: doxygen doxygen apidocs: Doxyfile |