]> eyrie.org Git - kerberos/krb5-strength.git/blobdiff - Makefile.am
Update default GCC warning flags
[kerberos/krb5-strength.git] / Makefile.am
index 51006993efe64470546ac8d7378dd076ebe95a8e..c3419ec10f7c0f714db505c74173dd2b42dcb2ed 100644 (file)
@@ -1,35 +1,40 @@
 # Automake makefile for krb5-strength.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2016 Russ Allbery <eagle@eyrie.org>
-# Copyright 2007, 2009, 2010, 2012, 2013, 2014
+# Copyright 2016, 2020, 2023 Russ Allbery <eagle@eyrie.org>
+# Copyright 2007, 2009-2010, 2012-2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = .gitignore LICENSE bootstrap cracklib/HISTORY cracklib/LICENCE \
-       cracklib/README cracklib/genrules.pl cracklib/mkdict tests/HOWTO    \
-       tests/TESTS tests/data/krb5.conf tests/data/make-krb5-conf          \
-       tests/data/passwords tests/data/perl.conf tests/data/perlcriticrc   \
-       tests/data/perltidyrc tests/data/valgrind.supp tests/data/wordlist  \
+EXTRA_DIST = .clang-format .github .gitignore README.md LICENSE bootstrap   \
+       ci/README ci/install ci/test cracklib/HISTORY cracklib/LICENCE      \
+       cracklib/README cracklib/genrules.pl cracklib/mkdict                \
+       docs/krb5-strength.5.in docs/krb5-strength.pod docs/metadata        \
+       tests/README tests/TESTS tests/data/cppcheck.supp                   \
+       tests/data/krb5.conf tests/data/make-krb5-conf tests/data/passwords \
+       tests/data/perl.conf tests/data/perlcriticrc tests/data/perltidyrc  \
+       tests/data/valgrind.supp tests/data/wordlist                        \
        tests/data/wordlist.cdb tests/data/wordlist.sqlite                  \
-       tests/docs/pod-spelling-t tests/docs/pod-t tests/perl/critic-t      \
+       tests/docs/pod-spelling-t tests/docs/pod-t                          \
+       tests/docs/spdx-license-t tests/perl/critic-t                       \
        tests/perl/minimum-version-t tests/perl/strict-t                    \
-       tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm                      \
-       tests/tap/perl/Test/RRA/Config.pm                                   \
+       tests/style/obsolete-strings-t tests/tap/libtap.sh                  \
+       tests/tap/perl/Test/RRA.pm tests/tap/perl/Test/RRA/Config.pm        \
        tests/tap/perl/Test/RRA/Automake.pm tests/tools/heimdal-history-t   \
        tests/tools/heimdal-strength-t tests/tools/wordlist-cdb-t           \
        tests/tools/wordlist-sqlite-t tests/tools/wordlist-t                \
-       tests/util/xmalloc-t tools/heimdal-strength.pod
+       tests/util/xmalloc-t tests/valgrind/logs-t                          \
+       tools/heimdal-strength.pod
 
 # Do this globally.  Everything needs to find the Kerberos headers and
 # libraries, and if we're using the system CrackLib, TinyCDB, or SQLite, add
 # its location unconditionally as well.
 AM_CPPFLAGS = $(CRACKLIB_CPPFLAGS) $(KRB5_CPPFLAGS) $(CDB_CPPFLAGS) \
-       $(SQLITE_CPPFLAGS)
+       $(SQLITE3_CPPFLAGS)
 AM_LDFLAGS = $(CRACKLIB_LDFLAGS) $(KRB5_LDFLAGS) $(CDB_LDFLAGS) \
-       $(SQLITE_LDFLAGS)
+       $(SQLITE3_LDFLAGS)
 
 # Build our portability library.
 noinst_LTLIBRARIES = portable/libportable.la
@@ -71,7 +76,7 @@ else
     plugin_strength_la_LIBADD = $(CRACKLIB_LIBS)
 endif
 plugin_strength_la_LIBADD += portable/libportable.la $(KRB5_LIBS) \
-       $(CDB_LIBS) $(SQLITE_LIBS)
+       $(CDB_LIBS) $(SQLITE3_LIBS)
 
 # The Heimdal external check program.
 bin_PROGRAMS = tools/heimdal-strength
@@ -86,7 +91,7 @@ else
     tools_heimdal_strength_LDADD = $(CRACKLIB_LIBS)
 endif
 tools_heimdal_strength_LDADD += util/libutil.a portable/libportable.la \
-       $(KRB5_LIBS) $(CDB_LIBS) $(SQLITE_LIBS)
+       $(KRB5_LIBS) $(CDB_LIBS) $(SQLITE3_LIBS)
 
 # Other tools.
 dist_bin_SCRIPTS = tools/heimdal-history tools/krb5-strength-wordlist
@@ -94,21 +99,28 @@ dist_bin_SCRIPTS = tools/heimdal-history tools/krb5-strength-wordlist
 # Man pages for all tools.
 dist_man_MANS = tools/heimdal-history.1 tools/heimdal-strength.1 \
        tools/krb5-strength-wordlist.1
+man_MANS = docs/krb5-strength.5
+
+# Substitute the installation paths into the manual page.
+docs/krb5-strength.5: $(srcdir)/docs/krb5-strength.5.in
+       [ -d docs ] || mkdir docs
+       sed -e 's%\(\\f(CI\)*\@moduledir\(\\fI\)*\@%$(moduledir)%' \
+           < $(srcdir)/docs/krb5-strength.5.in > $@
 
 # Handle the standard stuff that make maintainer-clean should probably remove
 # but doesn't.  This breaks the GNU coding standard, but in this area the GNU
 # coding standard is dumb.
-CLEANFILES = tests/data/dictionary.hwm tests/data/dictionary.pwd \
-       tests/data/dictionary.pwi
+CLEANFILES = docs/krb5-strength.5 tests/data/dictionary.hwm \
+       tests/data/dictionary.pwd tests/data/dictionary.pwi
 DISTCLEANFILES = tests/data/.placeholder
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile                 \
-       build-aux/config.guess build-aux/config.sub build-aux/depcomp    \
-       build-aux/install-sh build-aux/ltmain.sh build-aux/missing       \
-       config.h.in config.h.in~ configure m4/libtool.m4 m4/ltoptions.m4 \
-       m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4                  \
-       tests/data/wordlist.cdb tests/data/wordlist.sqlite               \
-       tools/heimdal-history.1 tools/heimdal-strength.1                 \
-       tools/krb5-strength-wordlist.1
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile                \
+       build-aux/config.guess build-aux/config.sub build-aux/depcomp   \
+       build-aux/install-sh build-aux/ltmain.sh build-aux/missing      \
+       config.h.in config.h.in~ configure docs/krb5-strength.5.in      \
+       m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4     \
+       m4/lt~obsolete.m4 tests/data/wordlist.cdb                       \
+       tests/data/wordlist.sqlite tools/heimdal-history.1              \
+       tools/heimdal-strength.1 tools/krb5-strength-wordlist.1
 
 # Also remove the generated *.c files from our JSON test data on
 # maintainer-clean.
@@ -117,16 +129,15 @@ maintainer-clean-local:
 
 warnings:
        $(MAKE) V=0 CFLAGS='$(WARNINGS_CFLAGS) $(AM_CFLAGS)' \
-           KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_GCC)'
+           KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_WARNINGS)'
        $(MAKE) V=0 CFLAGS='$(WARNINGS_CFLAGS) $(AM_CFLAGS)' \
-           KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_GCC)' $(check_PROGRAMS)
+           KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_WARNINGS)' $(check_PROGRAMS)
 
 # The bits below are for the test suite, not for the main package.
-check_PROGRAMS = tests/runtests tests/plugin/heimdal-t tests/plugin/mit-t \
-       tests/portable/asprintf-t tests/portable/mkstemp-t                \
-       tests/portable/reallocarray-t tests/portable/snprintf-t           \
-       tests/portable/strndup-t tests/util/messages-krb5-t               \
-       tests/util/messages-t tests/util/xmalloc
+check_PROGRAMS = tests/runtests tests/plugin/heimdal-t tests/plugin/mit-t   \
+       tests/portable/asprintf-t tests/portable/mkstemp-t                  \
+       tests/portable/reallocarray-t tests/portable/strndup-t              \
+       tests/util/messages-krb5-t tests/util/messages-t tests/util/xmalloc
 if EMBEDDED_CRACKLIB
     check_PROGRAMS += cracklib/packer
 endif
@@ -156,9 +167,6 @@ tests_portable_reallocarray_t_SOURCES = tests/portable/reallocarray-t.c \
        tests/portable/reallocarray.c
 tests_portable_reallocarray_t_LDADD = tests/tap/libtap.a \
        portable/libportable.la
-tests_portable_snprintf_t_SOURCES = tests/portable/snprintf-t.c \
-       tests/portable/snprintf.c
-tests_portable_snprintf_t_LDADD = tests/tap/libtap.a portable/libportable.la
 tests_portable_strndup_t_SOURCES = tests/portable/strndup-t.c \
        tests/portable/strndup.c
 tests_portable_strndup_t_LDADD = tests/tap/libtap.a portable/libportable.la
@@ -185,17 +193,32 @@ endif
 check-local: $(check_PROGRAMS) tests/data/dictionary.pwd
        cd tests && ./runtests -l $(abs_top_srcdir)/tests/TESTS
 
-# Used by maintainers to run the main test suite under valgrind.  Suppress
-# the xmalloc and pod-spelling tests because the former won't work properly
-# under valgrind (due to increased memory usage) and the latter is pointless
-# to run under valgrind.  Don't try to trace several of the tests that are
-# written in Perl or shell and test Perl programs.
+# Used by maintainers to check the source code with cppcheck.
+check-cppcheck:
+       cd $(abs_top_srcdir) &&                                         \
+           find . -name .git -prune -o -name '*.[ch]' -print           \
+           | cppcheck -q --force --error-exitcode=2 --file-list=-      \
+               --suppressions-list=tests/data/cppcheck.supp            \
+               --enable=warning,performance,portability,style
+
+# The full path to valgrind and its options, used when doing valgrind
+# testing.
+VALGRIND_COMMAND = $(PATH_VALGRIND) --leak-check=full                  \
+       --trace-children=yes --trace-children-skip=/bin/sh              \
+       --suppressions=$(abs_top_srcdir)/tests/data/valgrind.supp       \
+       --log-file=$(abs_top_builddir)/tests/tmp/valgrind/log.%p
+
+# Used by maintainers to run the main test suite under valgrind.
 check-valgrind: $(check_PROGRAMS) tests/data/dictionary.pwd
-       rm -rf $(abs_top_builddir)/tmp-valgrind
-       mkdir $(abs_top_builddir)/tmp-valgrind
-       env RRA_MAINTAINER_TESTS= valgrind --leak-check=full            \
-           --show-reachable=yes --trace-children=yes                   \
-           --log-file=$(abs_top_builddir)/tmp-valgrind/log.%p          \
-           --suppressions=$(abs_top_srcdir)/tests/data/valgrind.supp   \
-           --trace-children-skip="/bin/sh,*/cat,*/diff,*/expr,*/grep,*/mkdir,*/rm,*/rmdir,*/sed,*/sleep,*/true,*/wc,*/docs/*-t,*/perl/*-t,*/data/make-krb5-conf,*/tools/heimdal-history-t,*/tools/wordlist*-t" \
-           tests/runtests -l '$(abs_top_srcdir)/tests/TESTS'
+       rm -rf $(abs_top_builddir)/tests/tmp
+       mkdir $(abs_top_builddir)/tests/tmp
+       mkdir $(abs_top_builddir)/tests/tmp/valgrind
+       C_TAP_VALGRIND="$(VALGRIND_COMMAND)" tests/runtests \
+           -l '$(abs_top_srcdir)/tests/TESTS'
+
+# Used by maintainers to reformat all source code using clang-format and
+# excluding some files.
+reformat:
+       find . -name '*.[ch]' \! -name krb5-profile.c   \
+           \! -path './cracklib/*' -print              \
+           | xargs clang-format -style=file -i