hwclock: reuse error message

[thirdparty/util-linux.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 24d781dc7c6cac541c461398246682a50d46718c..2df89ff6dfeee3bd9a7f48989a983fa018a6e241 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,14 @@ AM_CPPFLAGS += \
 endif
 endif
 
+if WITH_COVERAGE
+AM_CPPFLAGS += \
+       -include $(top_srcdir)/include/coverage.h
+endif
+
 AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
 AM_CXXFLAGS = $(AM_CFLAGS)
-AM_LDFLAGS = $(ASAN_LDFLAGS) $(UBSAN_LDFLAGS) $(FUZZING_ENGINE_LDFLAGS)
+AM_LDFLAGS = $(ASAN_LDFLAGS) $(UBSAN_LDFLAGS) $(FUZZING_ENGINE_LDFLAGS) $(COVERAGE_LDFLAGS)
 
 # Add gettext stuff to the global LDADD for systems with separate libintl
 # library. The LTLIBINTL is generated by AM_GNU_GETTEXT macro.
@@ -58,6 +63,8 @@ dist_bashcompletion_DATA =
 check_PROGRAMS =
 dist_check_SCRIPTS =
 
+BUILT_SOURCES =
+
 PATHFILES =
 ADOCFILES_COMMON =
 MANPAGES =
@@ -114,6 +121,29 @@ include man-common/Makemodule.am
 
 include tests/Makemodule.am
 
+# Meson files
+EXTRA_DIST += \
+       meson.build \
+       meson_options.txt \
+       tools/meson-make-manpage-stub.sh \
+       tools/meson-make-symlink.sh \
+       \
+       include/meson.build \
+       libblkid/meson.build \
+       libmount/meson.build \
+       libmount/python/meson.build \
+       misc-utils/meson.build \
+       libsmartcols/meson.build \
+       text-utils/meson.build \
+       po/meson.build \
+       lib/meson.build \
+       libuuid/meson.build \
+       sys-utils/meson.build \
+       libfdisk/meson.build \
+       term-utils/meson.build \
+       disk-utils/meson.build \
+       login-utils/meson.build
+
 # pylibmountexec module must be installed after usrlib_exec libraries,
 # otherwise the libtool relink step will fail to find libmount.la and
 # will try -lmount which is possibly not available.
@@ -195,20 +225,24 @@ $(PATHFILES): Makefile
        @ mv $@.tmp $@
 
 
-CLEANFILES += $(MANPAGES) $(MANLINKS)
-EXTRA_DIST += $(ADOCFILES_COMMON)
-
 if ENABLE_ASCIIDOC
+EXTRA_DIST += $(ADOCFILES_COMMON) $(MANPAGES) $(MANLINKS)
 man_MANS += $(MANPAGES) $(MANLINKS)
 
-$(MANPAGES): $(ADOCFILES_COMMON) Makefile
+$(MANPAGES): $(ADOCFILES_COMMON)
 
 asciidoc_man_cmd = $(ASCIIDOCTOR) \
        -b manpage \
        -a 'release-version=$(VERSION)' \
        -a 'package-docdir=$(docdir)' \
        -a 'VERSION=$(VERSION)' \
-       -a 'ADJTIME_PATH=$(ADJTIME_PATH)'
+       -a 'ADJTIME_PATH=$(ADJTIME_PATH)' \
+       --load-path '$(abs_srcdir)/tools' \
+       --require asciidoctor-includetracker
+
+if HAVE_ASCIIDOCTOR_FAILURE_LEVEL
+asciidoc_man_cmd += --failure-level ERROR
+endif
 
 SUFFIXES = .1.adoc .3.adoc .5.adoc .8.adoc .1 .3 .5 .8
 .1.adoc.1 .3.adoc.3 .5.adoc.5 .8.adoc.8:
@@ -217,17 +251,42 @@ SUFFIXES = .1.adoc .3.adoc .5.adoc .8.adoc .1 .3 .5 .8
                $(asciidoc_man_cmd) --base-dir=$(abs_srcdir) \
                                    --destination-dir $(abs_builddir)/$$(dirname $@) $<
 
+-include \
+       $(abs_builddir)/**.1.deps \
+       $(abs_builddir)/**.3.deps \
+       $(abs_builddir)/**.5.deps \
+       $(abs_builddir)/**.8.deps
+
 $(MANLINKS): $(MANPAGES)
 gen-man: $(man_MANS)
 
+# Standard "make" follows BUILD_* macros from ./configure, and in this case, it
+# ignores man pages for disabled tools, but for distribution tarball, we need
+# to generate all man-pages (to avoid dependence on asciidoc). [kzak Jan-2022]
+gen-man-dist:
+       @list=`find -name *.adoc -not -path "*/man-common/*" -not -path "*/po-man/*" | sed -e 's/\.adoc//g'`; \
+       missing=`for p in $$list; do test -f $$p || echo $$p; done`; \
+       if test -n "$$missing"; then \
+               $(MAKE) $(AM_MAKEFLAGS) $$missing; \
+       fi;
+
+
+# !ENABLE_ASCIIDOC
 else
+
+if HAVE_MANPAGES
+EXTRA_DIST += $(ADOCFILES_COMMON) $(MANPAGES) $(MANLINKS)
+man_MANS += $(MANPAGES) $(MANLINKS)
+endif
+
 gen-man:
+gen-man-dist:
 endif
 
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
-dist-hook:
+dist-hook: gen-man-dist
        echo $(VERSION) > $(distdir)/.tarball-version
 # Set ChangeLog tag reference.
        sed -i "s!log!log?h=v$(VERSION)!" $(distdir)/ChangeLog
@@ -290,7 +349,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 
-BUILT_SOURCES = .version
+BUILT_SOURCES += .version
 .version:
        echo $(VERSION) > $@-t && mv $@-t $@