diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:34 +0000 |
| commit | 1272be04be0cb803eec87f602edb2e3e6f111aea (patch) | |
| tree | bce17f6478cdd9f3c4ec3d751135dc42786d6a56 /Makefile.am | |
| parent | Releasing progress-linux version 2.39.3-11~progress7.99u1. (diff) | |
| download | util-linux-1272be04be0cb803eec87f602edb2e3e6f111aea.tar.xz util-linux-1272be04be0cb803eec87f602edb2e3e6f111aea.zip | |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index effbb02..50ab8d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -DLOCALEDIR=\"$(localedir)\" \ -D_PATH_RUNSTATEDIR=\"${runstatedir}\" \ + -D_PATH_LOCALSTATEDIR=\"${localstatedir}\" \ -D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\" if USE_VENDORDIR @@ -17,9 +18,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. @@ -36,7 +42,7 @@ ul_libblkid_incdir = $(top_builddir)/libblkid/src ul_libmount_incdir = $(top_builddir)/libmount/src ul_libsmartcols_incdir = $(top_builddir)/libsmartcols/src ul_libfdisk_incdir = $(top_builddir)/libfdisk/src - +ul_liblastlog2_incdir = $(top_srcdir)/liblastlog2/src ul_libuuid_incdir = $(top_srcdir)/libuuid/src bashcompletiondir = @bashcompletiondir@ @@ -54,10 +60,13 @@ bin_PROGRAMS = sbin_PROGRAMS = dist_usrbin_exec_SCRIPTS = systemdsystemunit_DATA = +tmpfiles_DATA = dist_bashcompletion_DATA = check_PROGRAMS = dist_check_SCRIPTS = +BUILT_SOURCES = + PATHFILES = ADOCFILES_COMMON = MANPAGES = @@ -96,6 +105,7 @@ include tools/Makemodule.am include include/Makemodule.am include lib/Makemodule.am include libuuid/Makemodule.am +include liblastlog2/Makemodule.am include libblkid/Makemodule.am include libmount/Makemodule.am include libsmartcols/Makemodule.am @@ -109,9 +119,11 @@ include sys-utils/Makemodule.am include misc-utils/Makemodule.am include disk-utils/Makemodule.am +include pam_lastlog2/Makemodule.am include bash-completion/Makemodule.am include man-common/Makemodule.am +include Documentation/Makemodule.am include tests/Makemodule.am # Meson files @@ -131,6 +143,7 @@ EXTRA_DIST += \ po/meson.build \ lib/meson.build \ libuuid/meson.build \ + liblastlog2/meson.build \ sys-utils/meson.build \ libfdisk/meson.build \ term-utils/meson.build \ @@ -163,12 +176,14 @@ edit_cmd = sed \ -e 's|@docdir[@]|$(docdir)|g' \ -e 's|@includedir[@]|$(includedir)|g' \ -e 's|@runstatedir[@]|$(runstatedir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \ -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \ -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \ -e 's|@VERSION[@]|$(VERSION)|g' \ -e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \ -e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \ + -e 's|@LIBLASTLOG2_VERSION[@]|$(LIBLASTLOG2_VERSION)|g' \ -e 's|@LIBMOUNT_VERSION[@]|$(LIBMOUNT_VERSION)|g' \ -e 's|@LIBMOUNT_MAJOR_VERSION[@]|$(LIBMOUNT_MAJOR_VERSION)|g' \ -e 's|@LIBMOUNT_MINOR_VERSION[@]|$(LIBMOUNT_MINOR_VERSION)|g' \ @@ -339,10 +354,10 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --with-python \ --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ + --with-tmpfilesdir=$$dc_install_base/$(tmpfilesdir) -BUILT_SOURCES = .version +BUILT_SOURCES += .version .version: echo $(VERSION) > $@-t && mv $@-t $@ |