X-Git-Url: https://git.eyrie.org/?a=blobdiff_plain;f=Makefile.am;fp=Makefile.am;h=128938783408fb14f1e0ad08a3f4ac253e921a62;hb=510f358be6a968b5640b0b554118a08aa554d8cf;hp=10b96dd36293e4fa8c37da2262b862388bcebd8d;hpb=42bbbcfb783fe4e2e698b31472ed640d49baed8c;p=kerberos%2Fkrb5-strength.git

diff --git a/Makefile.am b/Makefile.am
index 10b96dd..1289387 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Automake makefile for krb5-strength.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2016, 2020 Russ Allbery <eagle@eyrie.org>
+# 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
 #
@@ -11,10 +11,11 @@ ACLOCAL_AMFLAGS = -I m4
 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  \
+	docs/docknot.yaml docs/krb5-strength.5.in docs/krb5-strength.pod    \
+	krb5-strength.spec 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			    \
@@ -32,9 +33,9 @@ EXTRA_DIST = .clang-format .github .gitignore README.md LICENSE bootstrap   \
 # 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
@@ -76,7 +77,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
@@ -91,7 +92,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
@@ -129,16 +130,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
@@ -168,9 +168,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
@@ -223,6 +220,6 @@ check-valgrind: $(check_PROGRAMS) tests/data/dictionary.pwd
 # Used by maintainers to reformat all source code using clang-format and
 # excluding some files.
 reformat:
-	find . -name '*.[ch]' \! -name snprintf.c \! -name krb5-profile.c \
-	    \! -path './cracklib/*' -print				  \
-	    | xargs clang-format-10 -style=file -i
+	find . -name '*.[ch]' \! -name krb5-profile.c	\
+	    \! -path './cracklib/*' -print		\
+	    | xargs clang-format -style=file -i